aboutsummaryrefslogtreecommitdiff
path: root/openssl-sys/src/probe.rs
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2015-02-05 21:04:18 -0800
committerSteven Fackler <[email protected]>2015-02-05 21:04:18 -0800
commitd06f226b3f7fd3517ea2299abebd7df031c1a428 (patch)
tree460de4005e2f5833766ee3e872e7d5c1ae6fc79f /openssl-sys/src/probe.rs
parentRelease v0.3.1 (diff)
downloadrust-openssl-d06f226b3f7fd3517ea2299abebd7df031c1a428.tar.xz
rust-openssl-d06f226b3f7fd3517ea2299abebd7df031c1a428.zip
Fix deprecation warnings in openssl-sys
Diffstat (limited to 'openssl-sys/src/probe.rs')
-rw-r--r--openssl-sys/src/probe.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/openssl-sys/src/probe.rs b/openssl-sys/src/probe.rs
index 1615f73a..7896b3e9 100644
--- a/openssl-sys/src/probe.rs
+++ b/openssl-sys/src/probe.rs
@@ -1,4 +1,4 @@
-use std::os;
+use std::env;
use std::old_io::fs::PathExtensions;
pub struct ProbeResult {
@@ -41,17 +41,17 @@ pub fn init_ssl_cert_env_vars() {
fn put(var: &str, path: Path) {
// Don't stomp over what anyone else has set
- match os::getenv(var) {
+ match env::var(var) {
Some(..) => {}
- None => os::setenv(var, path),
+ None => env::set_var(var, &path),
}
}
}
pub fn probe() -> ProbeResult {
let mut result = ProbeResult {
- cert_file: os::getenv("SSL_CERT_FILE").map(Path::new),
- cert_dir: os::getenv("SSL_CERT_DIR").map(Path::new),
+ cert_file: env::var_string("SSL_CERT_FILE").ok().map(Path::new),
+ cert_dir: env::var_string("SSL_CERT_DIR").ok().map(Path::new),
};
for certs_dir in find_certs_dirs().iter() {
// cert.pem looks to be an openssl 1.0.1 thing, while