min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rebase errors

This commit is contained in:
Manuel Schölling 2015-04-03 16:58:05 +02:00
parent fb98f482e2
commit 912cacf4bc
5 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openssl-sys/src/lib.rs
View File

@ -513,7 +513,6 @@ extern "C" {
pub fn SSL_CTX_new(method: *const SSL_METHOD) -> *mut SSL_CTX; 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_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, 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>); 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); pub fn SSL_CTX_set_verify_depth(ctx: *mut SSL_CTX, depth: c_int);

5
openssl/Cargo.toml
View File

@ -30,9 +30,6 @@ libc = "0.1"
[dev-dependencies] [dev-dependencies]
rustc-serialize = "0.3" rustc-serialize = "0.3"
[dependencies] [dependencies.connected_socket]
bitflags = "0.1.1"
[dependencies-dev.connected_socket]
connected_socket = "0.0.1" connected_socket = "0.0.1"
optional = true optional = true

2
openssl/src/lib.rs
View File

@ -21,5 +21,3 @@ pub mod bio;
pub mod crypto; pub mod crypto;
pub mod ssl; pub mod ssl;
pub mod x509; pub mod x509;
#[macro_use]
extern crate log;

2
openssl/src/ssl/mod.rs
View File

@ -425,7 +425,7 @@ impl SslContext {
pub fn set_read_ahead(&self, m: u32) { pub fn set_read_ahead(&self, m: u32) {
unsafe { 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);
} }
} }

9
openssl/src/ssl/tests.rs
View File

@ -26,8 +26,6 @@ use crypto::pkey::PKey;
use ssl::connected_socket::Connect; use ssl::connected_socket::Connect;
#[cfg(feature="dtlsv1")] #[cfg(feature="dtlsv1")]
use std::net::UdpSocket; use std::net::UdpSocket;
use ssl::SSL_VERIFY_PEER;
use x509::{X509StoreContext,X509};
use crypto::pkey::PKey; use crypto::pkey::PKey;
#[cfg(feature="dtlsv1")] #[cfg(feature="dtlsv1")]
@ -47,11 +45,6 @@ mod udp {
} }
} }
#[test]
fn test_new_ctx() {
SslContext::new(PROTOCOL).unwrap();
}
macro_rules! run_test( macro_rules! run_test(
($module:ident, $blk:expr) => ( ($module:ident, $blk:expr) => (
#[cfg(test)] #[cfg(test)]
@ -67,7 +60,7 @@ macro_rules! run_test(
use ssl::{SslContext, SslStream, VerifyCallback}; use ssl::{SslContext, SslStream, VerifyCallback};
#[cfg(feature="dtlsv1")] #[cfg(feature="dtlsv1")]
use connected_socket::Connect; use connected_socket::Connect;
use ssl::SslVerifyMode::SSL_VERIFY_PEER; use ssl::SSL_VERIFY_PEER;
use crypto::hash::Type::SHA256; use crypto::hash::Type::SHA256;
use x509::X509StoreContext; use x509::X509StoreContext;
use serialize::hex::FromHex; use serialize::hex::FromHex;