aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Lalic <[email protected]>2015-03-18 15:45:47 +0100
committerMarko Lalic <[email protected]>2015-03-23 08:14:47 +0100
commit3388a12802765c34eb21e98e15f5e973ae7a50c1 (patch)
tree4d3fd79f2225c7eec48d7ba55ea9944d8a0b1386
parentopenssl-sys: Add TLS extension constants (diff)
downloadrust-openssl-3388a12802765c34eb21e98e15f5e973ae7a50c1.tar.xz
rust-openssl-3388a12802765c34eb21e98e15f5e973ae7a50c1.zip
openssl: Add NPN crate feature
-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 c383cbc1..06ac2c1c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ os:
env:
global:
- secure: J4i75AV4KMrU/UQrLIzzIh35Xix40Ki0uWjm8j05oxlXVl5aPU2zB30AemDne2QXYzkN4kRG/iRnNORE/8D0lF7YipQNSNxgfiBVoOEfj/NSogvI2BftYX9vlLZJUvt+s/nbE3xa/Pyge1IPv7itDYGO7SMe8RTSqitgqyfE2Eg=
- - FEATURES="tlsv1_1 tlsv1_2 aes_xts"
+ - FEATURES="tlsv1_1 tlsv1_2 aes_xts npn"
before_script:
- openssl s_server -accept 15418 -www -cert openssl/test/cert.pem -key openssl/test/key.pem >/dev/null 2>&1 &
script:
diff --git a/openssl/Cargo.toml b/openssl/Cargo.toml
index 951fa958..8a1f5115 100644
--- a/openssl/Cargo.toml
+++ b/openssl/Cargo.toml
@@ -14,6 +14,7 @@ tlsv1_2 = ["openssl-sys/tlsv1_2"]
tlsv1_1 = ["openssl-sys/tlsv1_1"]
sslv2 = ["openssl-sys/sslv2"]
aes_xts = ["openssl-sys/aes_xts"]
+npn = ["openssl-sys/npn"]
[dependencies.openssl-sys]
path = "../openssl-sys"