Rustfmt

src/proxy/tests/handshake_advanced_clever_tests.rs

@@ -41,9 +41,16 @@ fn make_valid_tls_handshake(secret: &[u8], timestamp: u32) -> Vec<u8> {
     extensions.extend_from_slice(&(key_share_extension.len() as u16).to_be_bytes());
     extensions.extend_from_slice(&key_share_extension);
 
-    let body_len =
+    let body_len = 2
-        2 + 32 + 1 + session_id_len + 2 + TLS_AES_128_GCM_SHA256.len() + 1 + 1 + 2
+        + 32
-            + extensions.len();
+        + 1
+        + session_id_len
+        + 2
+        + TLS_AES_128_GCM_SHA256.len()
+        + 1
+        + 1
+        + 2
+        + extensions.len();
     let mut body = Vec::with_capacity(body_len);
     body.extend_from_slice(&TLS_VERSION);
     body.extend_from_slice(&[fill; 32]);

src/proxy/tests/handshake_baseline_invariant_tests.rs

@@ -38,9 +38,16 @@ fn make_valid_tls_handshake(secret: &[u8], timestamp: u32) -> Vec<u8> {
     extensions.extend_from_slice(&(key_share_extension.len() as u16).to_be_bytes());
     extensions.extend_from_slice(&key_share_extension);
 
-    let body_len =
+    let body_len = 2
-        2 + 32 + 1 + session_id_len + 2 + TLS_AES_128_GCM_SHA256.len() + 1 + 1 + 2
+        + 32
-            + extensions.len();
+        + 1
+        + session_id_len
+        + 2
+        + TLS_AES_128_GCM_SHA256.len()
+        + 1
+        + 1
+        + 2
+        + extensions.len();
     let mut body = Vec::with_capacity(body_len);
     body.extend_from_slice(&TLS_VERSION);
     body.extend_from_slice(&[fill; 32]);

src/proxy/tests/handshake_more_clever_tests.rs

@@ -45,9 +45,16 @@ fn make_valid_tls_handshake(secret: &[u8], timestamp: u32) -> Vec<u8> {
     extensions.extend_from_slice(&(key_share_extension.len() as u16).to_be_bytes());
     extensions.extend_from_slice(&key_share_extension);
 
-    let body_len =
+    let body_len = 2
-        2 + 32 + 1 + session_id_len + 2 + TLS_AES_128_GCM_SHA256.len() + 1 + 1 + 2
+        + 32
-            + extensions.len();
+        + 1
+        + session_id_len
+        + 2
+        + TLS_AES_128_GCM_SHA256.len()
+        + 1
+        + 1
+        + 2
+        + extensions.len();
     let mut body = Vec::with_capacity(body_len);
     body.extend_from_slice(&TLS_VERSION);
     body.extend_from_slice(&[fill; 32]);

src/proxy/tests/handshake_security_tests.rs

@@ -33,9 +33,16 @@ fn make_valid_tls_handshake_with_fill(secret: &[u8], timestamp: u32, fill: u8) -
     extensions.extend_from_slice(&(key_share_extension.len() as u16).to_be_bytes());
     extensions.extend_from_slice(&key_share_extension);
 
-    let body_len =
+    let body_len = 2
-        2 + 32 + 1 + session_id_len + 2 + TLS_AES_128_GCM_SHA256.len() + 1 + 1 + 2
+        + 32
-            + extensions.len();
+        + 1
+        + session_id_len
+        + 2
+        + TLS_AES_128_GCM_SHA256.len()
+        + 1
+        + 1
+        + 2
+        + extensions.len();
     let mut body = Vec::with_capacity(body_len);
     body.extend_from_slice(&TLS_VERSION);
     body.extend_from_slice(&[fill; 32]);

src/proxy/tests/handshake_timing_manual_bench_tests.rs

@@ -67,9 +67,16 @@ fn make_valid_tls_handshake(secret: &[u8], timestamp: u32) -> Vec<u8> {
     extensions.extend_from_slice(&(key_share_extension.len() as u16).to_be_bytes());
     extensions.extend_from_slice(&key_share_extension);
 
-    let body_len =
+    let body_len = 2
-        2 + 32 + 1 + session_id_len + 2 + TLS_AES_128_GCM_SHA256.len() + 1 + 1 + 2
+        + 32
-            + extensions.len();
+        + 1
+        + session_id_len
+        + 2
+        + TLS_AES_128_GCM_SHA256.len()
+        + 1
+        + 1
+        + 2
+        + extensions.len();
     let mut body = Vec::with_capacity(body_len);
     body.extend_from_slice(&TLS_VERSION);
     body.extend_from_slice(&[fill; 32]);