aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2015-10-25 21:43:09 -0700
committerSteven Fackler <[email protected]>2015-11-16 20:16:01 -0800
commitfae44250f6ffde38fa96d77ab6060fd9777f0bae (patch)
tree74f86074895fbeea79bcccc62058639bb4c62036
parentRevert "Revert "Merge pull request #280 from ltratt/libressl_build"" (diff)
downloadrust-openssl-fae44250f6ffde38fa96d77ab6060fd9777f0bae.tar.xz
rust-openssl-fae44250f6ffde38fa96d77ab6060fd9777f0bae.zip
Fix feature gated sslv3
-rw-r--r--.travis.yml2
-rw-r--r--openssl/Cargo.toml1
2 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index c52d014b..6f5d1ba9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ os:
- linux
env:
global:
- - FEATURES="tlsv1_2 tlsv1_1 dtlsv1 dtlsv1_2 sslv2 aes_xts npn alpn aes_ctr"
+ - FEATURES="tlsv1_2 tlsv1_1 dtlsv1 dtlsv1_2 sslv2 sslv3 aes_xts npn alpn aes_ctr"
before_install:
- (test $TRAVIS_OS_NAME == "osx" || ./openssl/test/build.sh)
script:
diff --git a/openssl/Cargo.toml b/openssl/Cargo.toml
index 23949259..ca7c8a62 100644
--- a/openssl/Cargo.toml
+++ b/openssl/Cargo.toml
@@ -15,6 +15,7 @@ tlsv1_1 = ["openssl-sys/tlsv1_1"]
dtlsv1 = ["openssl-sys/dtlsv1"]
dtlsv1_2 = ["openssl-sys/dtlsv1_2"]
sslv2 = ["openssl-sys/sslv2"]
+sslv3 = ["openssl-sys/sslv3"]
aes_xts = ["openssl-sys/aes_xts"]
aes_ctr = ["openssl-sys/aes_ctr"]
npn = ["openssl-sys/npn"]