dnim/rust-postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade to openssl 0.8

Browse Source
This commit is contained in:
Steven Fackler 2016-08-14 16:51:39 -07:00 committed by Steven Fackler
parent 0441c750a7
commit b76ac7e05a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@ -40,8 +40,8 @@ phf = "=0.7.15"
bit-vec = { version = "0.4", optional = true } bit-vec = { version = "0.4", optional = true }
chrono = { version = "0.2.14", optional = true } chrono = { version = "0.2.14", optional = true }
eui48 = { version = "0.1", optional = true } eui48 = { version = "0.1", optional = true }
openssl-verify = { version = "0.1", optional = true } openssl-verify = { version = "0.2", optional = true }
openssl = { version = ">= 0.6.4, < 0.8", optional = true } openssl = { version = "0.8", optional = true }
rustc-serialize = { version = "0.3", optional = true } rustc-serialize = { version = "0.3", optional = true }
security-framework = { version = "0.1.2", optional = true } security-framework = { version = "0.1.2", optional = true }
serde_json = { version = ">= 0.6, < 0.9", optional = true } serde_json = { version = ">= 0.6, < 0.9", optional = true }

4
src/io/openssl.rs
View File

@ -4,9 +4,9 @@ extern crate openssl_verify;
use std::error::Error; use std::error::Error;
use self::openssl::error::ErrorStack;
use self::openssl::ssl::{IntoSsl, SslContext, SslStream, SslMethod, SSL_VERIFY_PEER, use self::openssl::ssl::{IntoSsl, SslContext, SslStream, SslMethod, SSL_VERIFY_PEER,
SSL_OP_NO_SSLV2, SSL_OP_NO_SSLV3, SSL_OP_NO_COMPRESSION}; 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 self::openssl_verify::verify_callback;
use io::{TlsStream, Stream, TlsHandshake}; use io::{TlsStream, Stream, TlsHandshake};
@ -30,7 +30,7 @@ impl OpenSsl {
/// Creates a `OpenSsl` with a reasonable default configuration. /// Creates a `OpenSsl` with a reasonable default configuration.
/// ///
/// The configuration is modeled after libcurl's and is subject to change. /// The configuration is modeled after libcurl's and is subject to change.
pub fn new() -> Result<OpenSsl, SslError> { pub fn new() -> Result<OpenSsl, ErrorStack> {
let mut ctx = try!(SslContext::new(SslMethod::Sslv23)); let mut ctx = try!(SslContext::new(SslMethod::Sslv23));
try!(ctx.set_default_verify_paths()); try!(ctx.set_default_verify_paths());
ctx.set_options(SSL_OP_NO_SSLV2 | SSL_OP_NO_SSLV3 | SSL_OP_NO_COMPRESSION); ctx.set_options(SSL_OP_NO_SSLV2 | SSL_OP_NO_SSLV3 | SSL_OP_NO_COMPRESSION);