diff --git a/Cargo.lock b/Cargo.lock index 26dd4b1..fa7d0b6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -832,9 +832,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.49" +version = "0.1.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bbaead50122b06e9a973ac20bc7445074d99ad9a0a0654934876908a9cec82c" +checksum = "fd911b35d940d2bd0bea0f9100068e5b97b51a1cbe13d13382f132e0365257a0" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1089,7 +1089,7 @@ dependencies = [ [[package]] name = "native-tls" version = "0.2.10" -source = "git+https://github.com/lifegpc/rust-native-tls#8c4fe2aa4186971fc09b60833ca1d0dcaf701604" +source = "git+https://github.com/lifegpc/rust-native-tls#bc3a7a9372055dfb34470aa6d9c652ac2d81eefe" dependencies = [ "lazy_static", "libc", @@ -1214,8 +1214,7 @@ checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" [[package]] name = "openssl" version = "0.10.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0" +source = "git+https://github.com/lifegpc/rust-openssl#7bae8706680c978748e5f4123787576a54e27c5e" dependencies = [ "bitflags", "cfg-if 1.0.0", @@ -1229,8 +1228,7 @@ dependencies = [ [[package]] name = "openssl-macros" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +source = "git+https://github.com/lifegpc/rust-openssl#7bae8706680c978748e5f4123787576a54e27c5e" dependencies = [ "proc-macro2", "quote", @@ -1246,8 +1244,7 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" version = "0.9.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f" +source = "git+https://github.com/lifegpc/rust-openssl#7bae8706680c978748e5f4123787576a54e27c5e" dependencies = [ "autocfg", "cc", diff --git a/Cargo.toml b/Cargo.toml index a4ed657..e5b6217 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -59,6 +59,8 @@ server = ["async-trait", "base64", "db", "hyper", "multipart", "openssl"] ugoira = ["avdict", "bindgen", "cmake", "link-cplusplus"] [patch.crates-io] +openssl = { git = "https://github.com/lifegpc/rust-openssl" } +openssl-sys = { git = "https://github.com/lifegpc/rust-openssl" } native-tls = { git = "https://github.com/lifegpc/rust-native-tls" } [profile.release-with-debug] diff --git a/src/main.rs b/src/main.rs index b03938c..4ec57a7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -127,22 +127,6 @@ impl Main { None => {} } get_helper().update(cmd.clone(), self.settings.as_ref().unwrap().clone()); - match std::env::var("SSL_CERT_FILE") { - Ok(s) => { - if s.len() == 0 || !std::path::Path::new(&s).exists() { - let cert = utils::get_exe_path_else_current().join("cert.pem"); - if cert.exists() { - std::env::set_var("SSL_CERT_FILE", cert); - } - } - } - Err(_) => { - let cert = utils::get_exe_path_else_current().join("cert.pem"); - if cert.exists() { - std::env::set_var("SSL_CERT_FILE", cert); - } - } - } match cmd.cmd { Command::Config => { self.deal_config_cmd();