aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/ssl
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-11-12 13:35:51 +0000
committerSteven Fackler <[email protected]>2016-11-12 13:36:03 +0000
commit2a1d7b2bcb229283c85a991dd97aa83f59b02ed2 (patch)
treea698685af168241f1656948c6fcd3b7eddb70ee2 /openssl/src/ssl
parentAdjust cipher lists to work on older versions (diff)
downloadrust-openssl-2a1d7b2bcb229283c85a991dd97aa83f59b02ed2.tar.xz
rust-openssl-2a1d7b2bcb229283c85a991dd97aa83f59b02ed2.zip
Pick different cipher lists on 1.0.1 and 1.0.2
Diffstat (limited to 'openssl/src/ssl')
-rw-r--r--openssl/src/ssl/tests/mod.rs12
1 files changed, 10 insertions, 2 deletions
diff --git a/openssl/src/ssl/tests/mod.rs b/openssl/src/ssl/tests/mod.rs
index becf4fd3..50299aa8 100644
--- a/openssl/src/ssl/tests/mod.rs
+++ b/openssl/src/ssl/tests/mod.rs
@@ -1264,7 +1264,11 @@ fn tmp_ecdh_callback() {
let stream = TcpStream::connect(("127.0.0.1", port)).unwrap();
let mut ctx = SslContext::builder(SslMethod::tls()).unwrap();
- ctx.set_cipher_list("kECDHe").unwrap();
+ if cfg!(ossl101) {
+ ctx.set_cipher_list("kECDHe").unwrap();
+ } else {
+ ctx.set_cipher_list("ECDHE").unwrap();
+ }
let ssl = Ssl::new(&ctx.build()).unwrap();
ssl.connect(stream).unwrap();
@@ -1327,7 +1331,11 @@ fn tmp_ecdh_callback_ssl() {
let stream = TcpStream::connect(("127.0.0.1", port)).unwrap();
let mut ctx = SslContext::builder(SslMethod::tls()).unwrap();
- ctx.set_cipher_list("kECDHe").unwrap();
+ if cfg!(ossl101) {
+ ctx.set_cipher_list("kECDHe").unwrap();
+ } else {
+ ctx.set_cipher_list("ECDHE").unwrap();
+ }
let ssl = Ssl::new(&ctx.build()).unwrap();
ssl.connect(stream).unwrap();