Skip to content

Commit b76ac7e

Browse files
committed
Upgrade to openssl 0.8
1 parent 0441c75 commit b76ac7e

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ phf = "=0.7.15"
4040
bit-vec = { version = "0.4", optional = true }
4141
chrono = { version = "0.2.14", optional = true }
4242
eui48 = { version = "0.1", optional = true }
43-
openssl-verify = { version = "0.1", optional = true }
44-
openssl = { version = ">= 0.6.4, < 0.8", optional = true }
43+
openssl-verify = { version = "0.2", optional = true }
44+
openssl = { version = "0.8", optional = true }
4545
rustc-serialize = { version = "0.3", optional = true }
4646
security-framework = { version = "0.1.2", optional = true }
4747
serde_json = { version = ">= 0.6, < 0.9", optional = true }

src/io/openssl.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ extern crate openssl_verify;
44

55
use std::error::Error;
66

7+
use self::openssl::error::ErrorStack;
78
use self::openssl::ssl::{IntoSsl, SslContext, SslStream, SslMethod, SSL_VERIFY_PEER,
89
SSL_OP_NO_SSLV2, SSL_OP_NO_SSLV3, SSL_OP_NO_COMPRESSION};
9-
use self::openssl::ssl::error::SslError;
1010
use self::openssl_verify::verify_callback;
1111
use io::{TlsStream, Stream, TlsHandshake};
1212

@@ -30,7 +30,7 @@ impl OpenSsl {
3030
/// Creates a `OpenSsl` with a reasonable default configuration.
3131
///
3232
/// The configuration is modeled after libcurl's and is subject to change.
33-
pub fn new() -> Result<OpenSsl, SslError> {
33+
pub fn new() -> Result<OpenSsl, ErrorStack> {
3434
let mut ctx = try!(SslContext::new(SslMethod::Sslv23));
3535
try!(ctx.set_default_verify_paths());
3636
ctx.set_options(SSL_OP_NO_SSLV2 | SSL_OP_NO_SSLV3 | SSL_OP_NO_COMPRESSION);

0 commit comments

Comments
 (0)