Commit ae3d0e36 authored by Steven Fackler's avatar Steven Fackler
Browse files

Revert "Merge pull request #280 from ltratt/libressl_build" 

This reverts commit aad933e5, reversing
changes made to 60ee7314.
parent af255be9

openssl-sys/Cargo.toml

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ tlsv1_1 = [] 
dtlsv1 = []

dtlsv1_2 = []

sslv2 = []

sslv3 = []

aes_xts = []

aes_ctr = []

npn = []

openssl/src/ssl/mod.rs

+0 −3
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ pub enum SslMethod { 
    /// Support the SSLv2, SSLv3, TLSv1, TLSv1.1, and TLSv1.2 protocols depending on what the

    /// linked OpenSSL library supports.

    Sslv23,

    #[cfg(feature = "sslv3")]

    /// Only support the SSLv3 protocol.

    Sslv3,

    /// Only support the TLSv1 protocol.
@@ -133,7 +132,6 @@ impl SslMethod { 
        match *self {

            #[cfg(feature = "sslv2")]

            SslMethod::Sslv2 => ffi::SSLv2_method(),

            #[cfg(feature = "sslv3")]

            SslMethod::Sslv3 => ffi::SSLv3_method(),

            SslMethod::Tlsv1 => ffi::TLSv1_method(),

            SslMethod::Sslv23 => ffi::SSLv23_method(),
@@ -152,7 +150,6 @@ impl SslMethod { 
        match method {

            #[cfg(feature = "sslv2")]

            x if x == ffi::SSLv2_method() => Some(SslMethod::Sslv2),

            #[cfg(feature = "sslv3")]

            x if x == ffi::SSLv3_method() => Some(SslMethod::Sslv3),

            x if x == ffi::TLSv1_method() => Some(SslMethod::Tlsv1),

            x if x == ffi::SSLv23_method() => Some(SslMethod::Sslv23),

openssl/src/ssl/tests.rs

+4 −0
Original line number Diff line number Diff line
@@ -416,6 +416,10 @@ run_test!(set_ctx_options, |method, _| { 
    let mut ctx = SslContext::new(method).unwrap();

    let opts = ctx.set_options(ssl::SSL_OP_NO_TICKET);

    assert!(opts.contains(ssl::SSL_OP_NO_TICKET));

    assert!(!opts.contains(ssl::SSL_OP_CISCO_ANYCONNECT));

    let more_opts = ctx.set_options(ssl::SSL_OP_CISCO_ANYCONNECT);

    assert!(more_opts.contains(ssl::SSL_OP_NO_TICKET));

    assert!(more_opts.contains(ssl::SSL_OP_CISCO_ANYCONNECT));

});



run_test!(clear_ctx_options, |method, _| {