From 2a1d7b2bcb229283c85a991dd97aa83f59b02ed2 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Sat, 12 Nov 2016 13:35:51 +0000 Subject: [PATCH] Pick different cipher lists on 1.0.1 and 1.0.2 --- openssl/src/ssl/tests/mod.rs | 12 ++++++++++-- 1 file 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();