diff options
| author | Manuel Schölling <[email protected]> | 2015-04-03 16:58:05 +0200 |
|---|---|---|
| committer | Manuel Schölling <[email protected]> | 2015-04-06 12:26:10 +0200 |
| commit | 912cacf4bc3ea28003c5aa41f6cfd7a5989ba7d8 (patch) | |
| tree | 85158d44b76d16360fd498e0c7be8da7704d0b1e | |
| parent | Add ability to load private keys from files and use raw keys and certificates... (diff) | |
| download | rust-openssl-912cacf4bc3ea28003c5aa41f6cfd7a5989ba7d8.tar.xz rust-openssl-912cacf4bc3ea28003c5aa41f6cfd7a5989ba7d8.zip | |
Fix rebase errors
| -rw-r--r-- | openssl-sys/src/lib.rs | 1 | ||||
| -rw-r--r-- | openssl/Cargo.toml | 5 | ||||
| -rw-r--r-- | openssl/src/lib.rs | 2 | ||||
| -rw-r--r-- | openssl/src/ssl/mod.rs | 2 | ||||
| -rw-r--r-- | openssl/src/ssl/tests.rs | 9 |
5 files changed, 3 insertions, 16 deletions
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs index 0e41a682..109c4168 100644 --- a/openssl-sys/src/lib.rs +++ b/openssl-sys/src/lib.rs @@ -513,7 +513,6 @@ extern "C" { pub fn SSL_CTX_new(method: *const SSL_METHOD) -> *mut SSL_CTX; pub fn SSL_CTX_free(ctx: *mut SSL_CTX); - pub fn SSL_CTX_ctrl(ctx: *mut SSL_CTX, cmd: c_int, mode: c_long, parg: *mut c_void) -> c_long; pub fn SSL_CTX_set_verify(ctx: *mut SSL_CTX, mode: c_int, verify_callback: Option<extern fn(c_int, *mut X509_STORE_CTX) -> c_int>); pub fn SSL_CTX_set_verify_depth(ctx: *mut SSL_CTX, depth: c_int); diff --git a/openssl/Cargo.toml b/openssl/Cargo.toml index 0dd59ea5..50ce2e99 100644 --- a/openssl/Cargo.toml +++ b/openssl/Cargo.toml @@ -30,9 +30,6 @@ libc = "0.1" [dev-dependencies] rustc-serialize = "0.3" -[dependencies] -bitflags = "0.1.1" - -[dependencies-dev.connected_socket] +[dependencies.connected_socket] connected_socket = "0.0.1" optional = true diff --git a/openssl/src/lib.rs b/openssl/src/lib.rs index 3162f9b4..5826e486 100644 --- a/openssl/src/lib.rs +++ b/openssl/src/lib.rs @@ -21,5 +21,3 @@ pub mod bio; pub mod crypto; pub mod ssl; pub mod x509; -#[macro_use] -extern crate log; diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs index d47915b2..0dd2b3cb 100644 --- a/openssl/src/ssl/mod.rs +++ b/openssl/src/ssl/mod.rs @@ -425,7 +425,7 @@ impl SslContext { pub fn set_read_ahead(&self, m: u32) { unsafe { - ffi::SSL_CTX_set_read_ahead(*self.ctx, m as c_long); + ffi::SSL_CTX_set_read_ahead(self.ctx, m as c_long); } } diff --git a/openssl/src/ssl/tests.rs b/openssl/src/ssl/tests.rs index 609bb3ce..2b3a007c 100644 --- a/openssl/src/ssl/tests.rs +++ b/openssl/src/ssl/tests.rs @@ -26,8 +26,6 @@ use crypto::pkey::PKey; use ssl::connected_socket::Connect; #[cfg(feature="dtlsv1")] use std::net::UdpSocket; -use ssl::SSL_VERIFY_PEER; -use x509::{X509StoreContext,X509}; use crypto::pkey::PKey; #[cfg(feature="dtlsv1")] @@ -47,11 +45,6 @@ mod udp { } } -#[test] -fn test_new_ctx() { - SslContext::new(PROTOCOL).unwrap(); -} - macro_rules! run_test( ($module:ident, $blk:expr) => ( #[cfg(test)] @@ -67,7 +60,7 @@ macro_rules! run_test( use ssl::{SslContext, SslStream, VerifyCallback}; #[cfg(feature="dtlsv1")] use connected_socket::Connect; - use ssl::SslVerifyMode::SSL_VERIFY_PEER; + use ssl::SSL_VERIFY_PEER; use crypto::hash::Type::SHA256; use x509::X509StoreContext; use serialize::hex::FromHex; |