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

simplify tests

This commit is contained in:
Apoorv Kothari 2025-04-02 09:46:50 -07:00 committed by Kornel
parent f526b57daa
commit ba85fbb7ad
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
boring/src/ssl/test/session_resumption.rs
View File

@ -16,7 +16,7 @@ static NOOP_DECRYPTION_CALLED_BACK: AtomicU8 = AtomicU8::new(0);
#[test] #[test]
fn resume_session() { fn resume_session() {
static SESSION_TICKET: OnceLock<Vec<u8>> = OnceLock::new(); static SESSION_TICKET: OnceLock<SslSession> = OnceLock::new();
static NST_RECIEVED_COUNT: AtomicU8 = AtomicU8::new(0); static NST_RECIEVED_COUNT: AtomicU8 = AtomicU8::new(0);
let mut server = Server::builder(); let mut server = Server::builder();
@ -30,9 +30,7 @@ fn resume_session() {
client.ctx().set_new_session_callback(|_, session| { client.ctx().set_new_session_callback(|_, session| {
NST_RECIEVED_COUNT.fetch_add(1, Ordering::SeqCst); NST_RECIEVED_COUNT.fetch_add(1, Ordering::SeqCst);
// The server sends multiple session tickets but we only care to retrieve one. // The server sends multiple session tickets but we only care to retrieve one.
if SESSION_TICKET.get().is_none() { let _ = SESSION_TICKET.set(session);
SESSION_TICKET.set(session.to_der().unwrap()).unwrap();
}
}); });
let ssl_stream = client.connect(); let ssl_stream = client.connect();
@ -41,7 +39,7 @@ fn resume_session() {
assert_eq!(NST_RECIEVED_COUNT.load(Ordering::SeqCst), 2); assert_eq!(NST_RECIEVED_COUNT.load(Ordering::SeqCst), 2);
// Retrieve the session ticket // Retrieve the session ticket
let session_ticket = SslSession::from_der(SESSION_TICKET.get().unwrap()).unwrap(); let session_ticket = SESSION_TICKET.get().unwrap();
// Attempt to resume the connection using the session ticket // Attempt to resume the connection using the session ticket
let client_2 = server.client(); let client_2 = server.client();
@ -54,7 +52,7 @@ fn resume_session() {
#[test] #[test]
fn custom_callback_success() { fn custom_callback_success() {
static SESSION_TICKET: OnceLock<Vec<u8>> = OnceLock::new(); static SESSION_TICKET: OnceLock<SslSession> = OnceLock::new();
static NST_RECIEVED_COUNT: AtomicU8 = AtomicU8::new(0); static NST_RECIEVED_COUNT: AtomicU8 = AtomicU8::new(0);
let mut server = Server::builder(); let mut server = Server::builder();
@ -71,9 +69,7 @@ fn custom_callback_success() {
client.ctx().set_new_session_callback(|_, session| { client.ctx().set_new_session_callback(|_, session| {
NST_RECIEVED_COUNT.fetch_add(1, Ordering::SeqCst); NST_RECIEVED_COUNT.fetch_add(1, Ordering::SeqCst);
// The server sends multiple session tickets but we only care to retrieve one. // The server sends multiple session tickets but we only care to retrieve one.
if SESSION_TICKET.get().is_none() { let _ = SESSION_TICKET.set(session);
SESSION_TICKET.set(session.to_der().unwrap()).unwrap();
}
}); });
let ssl_stream = client.connect(); let ssl_stream = client.connect();
@ -84,7 +80,7 @@ fn custom_callback_success() {
assert_eq!(NST_RECIEVED_COUNT.load(Ordering::SeqCst), 2); assert_eq!(NST_RECIEVED_COUNT.load(Ordering::SeqCst), 2);
// Retrieve the session ticket // Retrieve the session ticket
let session_ticket = SslSession::from_der(SESSION_TICKET.get().unwrap()).unwrap(); let session_ticket = SESSION_TICKET.get().unwrap();
// Attempt to resume the connection using the session ticket // Attempt to resume the connection using the session ticket
let client_2 = server.client(); let client_2 = server.client();
@ -99,7 +95,7 @@ fn custom_callback_success() {
#[test] #[test]
fn custom_callback_unrecognized_decryption_ticket() { fn custom_callback_unrecognized_decryption_ticket() {
static SESSION_TICKET: OnceLock<Vec<u8>> = OnceLock::new(); static SESSION_TICKET: OnceLock<SslSession> = OnceLock::new();
static NST_RECIEVED_COUNT: AtomicU8 = AtomicU8::new(0); static NST_RECIEVED_COUNT: AtomicU8 = AtomicU8::new(0);
let mut server = Server::builder(); let mut server = Server::builder();
@ -116,9 +112,7 @@ fn custom_callback_unrecognized_decryption_ticket() {
client.ctx().set_new_session_callback(|_, session| { client.ctx().set_new_session_callback(|_, session| {
NST_RECIEVED_COUNT.fetch_add(1, Ordering::SeqCst); NST_RECIEVED_COUNT.fetch_add(1, Ordering::SeqCst);
// The server sends multiple session tickets but we only care to retrieve one. // The server sends multiple session tickets but we only care to retrieve one.
if SESSION_TICKET.get().is_none() { let _ = SESSION_TICKET.set(session);
SESSION_TICKET.set(session.to_der().unwrap()).unwrap();
}
}); });
let ssl_stream = client.connect(); let ssl_stream = client.connect();
@ -129,7 +123,7 @@ fn custom_callback_unrecognized_decryption_ticket() {
assert_eq!(NST_RECIEVED_COUNT.load(Ordering::SeqCst), 2); assert_eq!(NST_RECIEVED_COUNT.load(Ordering::SeqCst), 2);
// Retrieve the session ticket // Retrieve the session ticket
let session_ticket = SslSession::from_der(SESSION_TICKET.get().unwrap()).unwrap(); let session_ticket = SESSION_TICKET.get().unwrap();
// Attempt to resume the connection using the session ticket // Attempt to resume the connection using the session ticket
let client_2 = server.client(); let client_2 = server.client();