Commit 912cacf4 authored by Manuel Schölling's avatar Manuel Schölling
Browse files

Fix rebase errors

parent fb98f482

openssl-sys/src/lib.rs

+0 −1
Original line number Diff line number Diff line
@@ -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);

openssl/Cargo.toml

+1 −4
Original line number Diff line number Diff line
@@ -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

openssl/src/lib.rs

+0 −2
Original line number Diff line number Diff line
@@ -21,5 +21,3 @@ pub mod bio; 
pub mod crypto;

pub mod ssl;

pub mod x509;
 
#[macro_use]

extern crate log;

openssl/src/ssl/mod.rs

+1 −1
Original line number Diff line number Diff line
@@ -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);

        }

    }

openssl/src/ssl/tests.rs

+1 −8
Original line number Diff line number Diff line
@@ -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;