min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure psk test callbacks are called

This commit is contained in:
Benjamin Cheng 2018-06-02 15:50:24 -04:00
parent 285884c925
commit 88c61d252f
No known key found for this signature in database
GPG Key ID: 4FE22E7528E97BD8
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openssl/src/ssl/test.rs
View File

@ -1543,6 +1543,8 @@ fn psk_ciphers() {
const CIPHER: &'static str = "PSK-AES128-CBC-SHA"; const CIPHER: &'static str = "PSK-AES128-CBC-SHA";
const PSK: &[u8] = b"thisisaverysecurekey"; const PSK: &[u8] = b"thisisaverysecurekey";
const CLIENT_IDENT: &[u8] = b"thisisaclient"; const CLIENT_IDENT: &[u8] = b"thisisaclient";
static CLIENT_CALLED: AtomicBool = ATOMIC_BOOL_INIT;
static SERVER_CALLED: AtomicBool = ATOMIC_BOOL_INIT;
let listener = TcpListener::bind("127.0.0.1:0").unwrap(); let listener = TcpListener::bind("127.0.0.1:0").unwrap();
let port = listener.local_addr().unwrap().port(); let port = listener.local_addr().unwrap().port();
@ -1554,6 +1556,7 @@ fn psk_ciphers() {
ctx.set_psk_server_callback(move |_, identity, psk| { ctx.set_psk_server_callback(move |_, identity, psk| {
assert!(identity.unwrap_or(&[]) == CLIENT_IDENT); assert!(identity.unwrap_or(&[]) == CLIENT_IDENT);
psk[..PSK.len()].copy_from_slice(&PSK); psk[..PSK.len()].copy_from_slice(&PSK);
SERVER_CALLED.store(true, Ordering::SeqCst);
Ok(PSK.len()) Ok(PSK.len())
}); });
let ssl = Ssl::new(&ctx.build()).unwrap(); let ssl = Ssl::new(&ctx.build()).unwrap();
@ -1567,8 +1570,11 @@ fn psk_ciphers() {
identity[..CLIENT_IDENT.len()].copy_from_slice(&CLIENT_IDENT); identity[..CLIENT_IDENT.len()].copy_from_slice(&CLIENT_IDENT);
identity[CLIENT_IDENT.len()] = 0; identity[CLIENT_IDENT.len()] = 0;
psk[..PSK.len()].copy_from_slice(&PSK); psk[..PSK.len()].copy_from_slice(&PSK);
CLIENT_CALLED.store(true, Ordering::SeqCst);
Ok(PSK.len()) Ok(PSK.len())
}); });
let ssl = Ssl::new(&ctx.build()).unwrap(); let ssl = Ssl::new(&ctx.build()).unwrap();
ssl.connect(stream).unwrap(); ssl.connect(stream).unwrap();
assert!(CLIENT_CALLED.load(Ordering::SeqCst) && SERVER_CALLED.load(Ordering::SeqCst));
} }