From bcc4ca02850dbd1708fd7d40ec5fb980a859142a Mon Sep 17 00:00:00 2001 From: Benjamin Cheng Date: Sat, 2 Jun 2018 13:54:33 -0400 Subject: [PATCH] Change psk test cipher to PSK-AES128-CBC-SHA Hopefully it works on CI servers now --- openssl/src/ssl/test.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openssl/src/ssl/test.rs b/openssl/src/ssl/test.rs index e590f1a15..6b5395894 100644 --- a/openssl/src/ssl/test.rs +++ b/openssl/src/ssl/test.rs @@ -1540,6 +1540,7 @@ fn stateless() { #[cfg(not(osslconf = "OPENSSL_NO_PSK"))] #[test] fn psk_ciphers() { + const CIPHER: &'static str = "PSK-AES128-CBC-SHA"; const PSK: &[u8] = b"thisisaverysecurekey"; const CLIENT_IDENT: &[u8] = b"thisisaclient"; @@ -1549,7 +1550,7 @@ fn psk_ciphers() { thread::spawn(move || { let stream = listener.accept().unwrap().0; let mut ctx = SslContext::builder(SslMethod::tls()).unwrap(); - ctx.set_cipher_list("ECDHE-PSK-CHACHA20-POLY1305").unwrap(); + ctx.set_cipher_list(CIPHER).unwrap(); ctx.set_psk_server_callback(move |_, identity, psk| { assert!(identity.unwrap_or(&[]) == CLIENT_IDENT); psk[..PSK.len()].copy_from_slice(&PSK); @@ -1561,7 +1562,7 @@ fn psk_ciphers() { let stream = TcpStream::connect(("127.0.0.1", port)).unwrap(); let mut ctx = SslContext::builder(SslMethod::tls()).unwrap(); - ctx.set_cipher_list("ECDHE-PSK-CHACHA20-POLY1305").unwrap(); + ctx.set_cipher_list(CIPHER).unwrap(); ctx.set_psk_client_callback(move |_, _, identity, psk| { identity[..CLIENT_IDENT.len()].copy_from_slice(&CLIENT_IDENT); identity[CLIENT_IDENT.len()] = 0; -- GitLab