PR feedback

Author: maddeleine

examples/resumption/src/bin/server.rs

@@ -17,23 +17,24 @@ pub static TICKET_KEY: [u8; 16] = [0; 16];
 pub static TICKET_KEY_NAME: &[u8] = "keyname".as_bytes();
 
 struct ResumptionConfig;
-impl ConfigLoader for ResumptionConfig {
-    fn load(&mut self, _cx: ConnectionContext) -> s2n_tls::config::Config {
+
+impl ResumptionConfig {
+    fn build() -> Result<s2n_tls::config::Config, s2n_tls::error::Error> {
         let mut config_builder = s2n_tls::config::Builder::new();
         config_builder
-            .enable_session_tickets(true)
-            .unwrap()
-            .add_session_ticket_key(TICKET_KEY_NAME, &TICKET_KEY, SystemTime::now())
-            .unwrap()
-            .load_pem(CERT_PEM.as_bytes(), KEY_PEM.as_bytes())
-            .unwrap()
-            .set_security_policy(&s2n_tls::security::DEFAULT_TLS13)
-            .unwrap()
-            .enable_quic()
-            .unwrap()
-            .set_application_protocol_preference([b"h3"])
-            .unwrap();
-        config_builder.build().unwrap()
+            .enable_session_tickets(true)?
+            .add_session_ticket_key(TICKET_KEY_NAME, &TICKET_KEY, SystemTime::now())?
+            .load_pem(CERT_PEM.as_bytes(), KEY_PEM.as_bytes())?
+            .set_security_policy(&s2n_tls::security::DEFAULT_TLS13)?
+            .enable_quic()?
+            .set_application_protocol_preference([b"h3"])?;
+        config_builder.build()
+    }
+}
+
+impl ConfigLoader for ResumptionConfig {
+    fn load(&mut self, _cx: ConnectionContext) -> s2n_tls::config::Config {
+        Self::build().expect("Config builder failed")
     }
 }
 

quic/s2n-quic-tls/src/callback.rs

@@ -352,12 +352,8 @@ pub struct State {
 impl State {
     /// Complete the handshake
     pub fn on_handshake_complete(&mut self) {
-        if self.rx_phase == HandshakePhase::Handshake {
-            self.rx_phase.transition();
-        }
-        if self.tx_phase == HandshakePhase::Handshake {
-            self.tx_phase.transition();
-        }
+        self.tx_phase.transition();
+        self.rx_phase.transition();
         debug_assert_eq!(self.tx_phase, HandshakePhase::Application);
         debug_assert_eq!(self.rx_phase, HandshakePhase::Application);
     }

quic/s2n-quic-tls/src/tests.rs

@@ -25,7 +25,7 @@ use s2n_tls::{
     connection::Connection,
     error::Error,
 };
-use std::sync::Arc;
+use std::{sync::Arc, time::SystemTime};
 
 pub struct MyCallbackHandler {
     done: Arc<AtomicBool>,
@@ -75,6 +75,31 @@ impl ConnectionFuture for MyConnectionFuture {
     }
 }
 
+pub static TICKET_KEY: [u8; 16] = [0; 16];
+pub static TICKET_KEY_NAME: &[u8] = "keyname".as_bytes();
+
+struct ResumptionConfig;
+
+impl ResumptionConfig {
+    fn build() -> Result<s2n_tls::config::Config, s2n_tls::error::Error> {
+        let mut config_builder = s2n_tls::config::Builder::new();
+        config_builder
+            .enable_session_tickets(true)?
+            .add_session_ticket_key(TICKET_KEY_NAME, &TICKET_KEY, SystemTime::now())?
+            .load_pem(CERT_PEM.as_bytes(), KEY_PEM.as_bytes())?
+            .set_security_policy(&s2n_tls::security::DEFAULT_TLS13)?
+            .enable_quic()?
+            .set_application_protocol_preference([b"h3"])?;
+        config_builder.build()
+    }
+}
+
+impl crate::ConfigLoader for ResumptionConfig {
+    fn load(&mut self, _cx: crate::ConnectionContext) -> s2n_tls::config::Config {
+        Self::build().expect("Config builder failed")
+    }
+}
+
 #[cfg(any(test, all(s2n_quic_unstable, feature = "unstable_private_key")))]
 impl PrivateKeyCallback for MyCallbackHandler {
     fn handle_operation(
@@ -203,6 +228,10 @@ fn s2n_server_with_client_auth() -> Result<server::Server, Error> {
         .build()
 }
 
+fn s2n_server_with_resumption() -> server::Server<ResumptionConfig> {
+    server::Server::from_loader(ResumptionConfig)
+}
+
 fn s2n_server_with_client_auth_verifier_rejects_client_certs() -> Result<server::Server, Error> {
     server::Builder::default()
         .with_empty_trust_store()?
@@ -288,6 +317,24 @@ fn s2n_client_s2n_server_test() {
     run(&mut server_endpoint, &mut client_endpoint, None);
 }
 
+#[test]
+#[cfg_attr(miri, ignore)]
+fn s2n_client_s2n_server_resumption_test() {
+    let mut client_endpoint = s2n_client();
+    let mut server_endpoint = s2n_server_with_resumption();
+
+    run(&mut server_endpoint, &mut client_endpoint, None);
+}
+
+#[test]
+#[cfg_attr(miri, ignore)]
+fn rustls_client_s2n_server_resumption_test() {
+    let mut client_endpoint = rustls_client();
+    let mut server_endpoint = s2n_server_with_resumption();
+
+    run(&mut server_endpoint, &mut client_endpoint, None);
+}
+
 #[test]
 #[cfg_attr(miri, ignore)]
 fn rustls_client_s2n_server_test() {

quic/s2n-quic-transport/src/space/application.rs

@@ -606,7 +606,6 @@ impl<Config: endpoint::Config> transmission::interest::Provider for ApplicationS
         self.recovery_manager.transmission_interest(query)?;
         self.stream_manager.transmission_interest(query)?;
         self.datagram_manager.transmission_interest(query)?;
-
         Ok(())
     }
 }