aboutsummaryrefslogtreecommitdiff
path: root/openssl/src
diff options
context:
space:
mode:
authorMarc-Antoine Perennou <[email protected]>2017-09-17 19:55:47 +0200
committerMarc-Antoine Perennou <[email protected]>2017-09-17 19:55:47 +0200
commitb73548da1896ad0cf114d49c74591ca893643557 (patch)
tree0072ad088e8e63da59fcaf6d8f1f07403e0c3a29 /openssl/src
parentopenssl: libressl 2.6.1 dropped suuport for npn (diff)
downloadrust-openssl-b73548da1896ad0cf114d49c74591ca893643557.tar.xz
rust-openssl-b73548da1896ad0cf114d49c74591ca893643557.zip
openssl: ecdh_tmp_callback doesn't work with libressl 2.6.1
Signed-off-by: Marc-Antoine Perennou <[email protected]>
Diffstat (limited to 'openssl/src')
-rw-r--r--openssl/src/ssl/tests/mod.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/openssl/src/ssl/tests/mod.rs b/openssl/src/ssl/tests/mod.rs
index b23de763..a3ac6832 100644
--- a/openssl/src/ssl/tests/mod.rs
+++ b/openssl/src/ssl/tests/mod.rs
@@ -1241,7 +1241,7 @@ fn tmp_dh_callback() {
}
#[test]
-#[cfg(any(all(feature = "v101", ossl101), all(feature = "v102", ossl102)))]
+#[cfg(any(all(feature = "v101", ossl101, not(libressl261)), all(feature = "v102", ossl102)))]
fn tmp_ecdh_callback() {
use ec::EcKey;
use nid;
@@ -1308,7 +1308,7 @@ fn tmp_dh_callback_ssl() {
}
#[test]
-#[cfg(any(all(feature = "v101", ossl101), all(feature = "v102", ossl102)))]
+#[cfg(any(all(feature = "v101", ossl101, not(libressl261)), all(feature = "v102", ossl102)))]
fn tmp_ecdh_callback_ssl() {
use ec::EcKey;
use nid;