aboutsummaryrefslogtreecommitdiff
path: root/openssl/src
diff options
context:
space:
mode:
authorBenjamin Cheng <[email protected]>2018-06-02 13:54:33 -0400
committerBenjamin Cheng <[email protected]>2018-06-02 13:59:04 -0400
commitbcc4ca02850dbd1708fd7d40ec5fb980a859142a (patch)
treed84d088851cd63219a5985e85643c701a39bc2d8 /openssl/src
parentUse is_null() (diff)
downloadrust-openssl-bcc4ca02850dbd1708fd7d40ec5fb980a859142a.tar.xz
rust-openssl-bcc4ca02850dbd1708fd7d40ec5fb980a859142a.zip
Change psk test cipher to PSK-AES128-CBC-SHA
Hopefully it works on CI servers now
Diffstat (limited to 'openssl/src')
-rw-r--r--openssl/src/ssl/test.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/openssl/src/ssl/test.rs b/openssl/src/ssl/test.rs
index e590f1a1..6b539589 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;