diff --git a/Cargo.toml b/Cargo.toml index b86c2f32..c31fbcab 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,8 +40,8 @@ phf = "=0.7.15" bit-vec = { version = "0.4", optional = true } chrono = { version = "0.2.14", optional = true } eui48 = { version = "0.1", optional = true } -openssl-verify = { version = "0.1", optional = true } -openssl = { version = ">= 0.6.4, < 0.8", optional = true } +openssl-verify = { version = "0.2", optional = true } +openssl = { version = "0.8", optional = true } rustc-serialize = { version = "0.3", optional = true } security-framework = { version = "0.1.2", optional = true } serde_json = { version = ">= 0.6, < 0.9", optional = true } diff --git a/src/io/openssl.rs b/src/io/openssl.rs index 0a75703c..6c76beea 100644 --- a/src/io/openssl.rs +++ b/src/io/openssl.rs @@ -4,9 +4,9 @@ extern crate openssl_verify; use std::error::Error; +use self::openssl::error::ErrorStack; use self::openssl::ssl::{IntoSsl, SslContext, SslStream, SslMethod, SSL_VERIFY_PEER, SSL_OP_NO_SSLV2, SSL_OP_NO_SSLV3, SSL_OP_NO_COMPRESSION}; -use self::openssl::ssl::error::SslError; use self::openssl_verify::verify_callback; use io::{TlsStream, Stream, TlsHandshake}; @@ -30,7 +30,7 @@ impl OpenSsl { /// Creates a `OpenSsl` with a reasonable default configuration. /// /// The configuration is modeled after libcurl's and is subject to change. - pub fn new() -> Result { + pub fn new() -> Result { let mut ctx = try!(SslContext::new(SslMethod::Sslv23)); try!(ctx.set_default_verify_paths()); ctx.set_options(SSL_OP_NO_SSLV2 | SSL_OP_NO_SSLV3 | SSL_OP_NO_COMPRESSION);