Merge pull request RustPython#1867 from RustPython/coolreader18/fix-openssl-vendor-certs

youknowone · web-flow · commit f2098eb3c4a7 · 2020-04-14T01:00:03.000+09:00
Fix openssl certificates not being found when openssl is vendored
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -95,6 +95,7 @@ socket2 = { version = "0.3", features = ["unix"] }
 rustyline = "6.0"
 openssl = { version = "0.10", features = ["vendored"] }
 openssl-sys = "0.9"
+openssl-probe = "0.1"
 
 [target.'cfg(not(any(target_arch = "wasm32", target_os = "redox")))'.dependencies]
 dns-lookup = "1.0"
diff --git a/vm/src/stdlib/ssl.rs b/vm/src/stdlib/ssl.rs
@@ -740,6 +740,11 @@ fn parse_version_info(mut n: i64) -> (u8, u8, u8, u8, u8) {
 }
 
 pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
+    // if openssl is vendored, it doesn't know the locations of system certificates
+    match option_env!("OPENSSL_NO_VENDOR") {
+        None | Some("0") => {}
+        _ => openssl_probe::init_ssl_cert_env_vars(),
+    }
     openssl::init();
     let ctx = &vm.ctx;
     let ssl_error = create_type(
