From ae3d0e36d71bb121c2fc1a75b3bc6d97f0e61480 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@palantir.com>
Date: Wed, 14 Oct 2015 21:51:32 -0400
Subject: [PATCH] Revert "Merge pull request #280 from ltratt/libressl_build"

This reverts commit aad933e5077b2c73e1f05d7314e442531a562bcf, reversing
changes made to 60ee731408facdc8e3dfc000fdee2f1291fad664.
---
 openssl-sys/Cargo.toml   | 1 -
 openssl/src/ssl/mod.rs   | 3 ---
 openssl/src/ssl/tests.rs | 4 ++++
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/openssl-sys/Cargo.toml b/openssl-sys/Cargo.toml
index 1d4db4753..b13fc80a1 100644
--- a/openssl-sys/Cargo.toml
+++ b/openssl-sys/Cargo.toml
@@ -17,7 +17,6 @@ tlsv1_1 = []
 dtlsv1 = []
 dtlsv1_2 = []
 sslv2 = []
-sslv3 = []
 aes_xts = []
 aes_ctr = []
 npn = []
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs
index 3580c66dd..e76529a5e 100644
--- a/openssl/src/ssl/mod.rs
+++ b/openssl/src/ssl/mod.rs
@@ -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),
diff --git a/openssl/src/ssl/tests.rs b/openssl/src/ssl/tests.rs
index a8bd4a87a..033a3b864 100644
--- a/openssl/src/ssl/tests.rs
+++ b/openssl/src/ssl/tests.rs
@@ -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, _| {
-- 
GitLab