Merge pull request #42 from hapsoc/rustls-0.22

chore!: Bump to rustls 0.22, tokio-rustls 0.25
rustls · Mar 11, 2024 · a3ec205 · a3ec205
2 parents 3283fbd + 746167e
commit a3ec205
Show file tree

Hide file tree

Showing 7 changed files with 283 additions and 137 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -30,7 +30,8 @@ jobs:
         run: |
           cd ${{ github.workspace }}
           cargo clippy
-          just ci-test
+          # show backtraces
+          RUST_BACKTRACE=1 just ci-test
       - name: Upload coverage information
         run: |
           curl -Os https://uploader.codecov.io/latest/linux/codecov 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,8 +14,8 @@ Configures kTLS for tokio-rustls client and server connections.
 libc = { version = "0.2.148", features = ["const-extern-fn"] }
 thiserror = "1.0.49"
 tracing = "0.1.37"
-tokio-rustls = "0.24.1"
-rustls = { version = "0.21.7", features = ["secret_extraction"] }
+tokio-rustls = "0.25.0"
+rustls = { version = "0.22.2" }
 smallvec = "1.11.1"
 memoffset = "0.9.0"
 pin-project-lite = "0.2.13"

diff --git a/Justfile b/Justfile
@@ -15,4 +15,7 @@ cov:
 
 # Run all tests
 test *args:
-	RUST_BACKTRACE=1 cargo nextest run {{args}}
+	RUST_BACKTRACE=1 cargo nextest run {{args}}
+
+check:
+	cargo clippy --all-features --all-targets
diff --git a/src/ffi.rs b/src/ffi.rs
@@ -138,27 +138,84 @@ impl CryptoInfo {
         };
 
         Ok(match secrets {
-            ConnectionTrafficSecrets::Aes128Gcm { key, salt, iv } => {
-                CryptoInfo::AesGcm128(ktls::tls12_crypto_info_aes_gcm_128 {
-                    info: ktls::tls_crypto_info {
-                        version,
-                        cipher_type: ktls::TLS_CIPHER_AES_GCM_128 as _,
-                    },
-                    iv,
-                    key,
-                    salt,
-                    rec_seq: seq.to_be_bytes(),
-                })
+            ConnectionTrafficSecrets::Aes128Gcm { key, iv } => {
+                // see https://github.com/rustls/rustls/issues/1833, between
+                // rustls 0.21 and 0.22, the extract_keys codepath was changed,
+                // so, for TLS 1.2, both GCM-128 and GCM-256 return the
+                // Aes128Gcm variant.
+
+                match key.as_ref().len() {
+                    16 => CryptoInfo::AesGcm128(ktls::tls12_crypto_info_aes_gcm_128 {
+                        info: ktls::tls_crypto_info {
+                            version,
+                            cipher_type: ktls::TLS_CIPHER_AES_GCM_128 as _,
+                        },
+                        iv: iv
+                            .as_ref()
+                            .get(4..)
+                            .expect("AES-GCM-128 iv is 8 bytes")
+                            .try_into()
+                            .expect("AES-GCM-128 iv is 8 bytes"),
+                        key: key
+                            .as_ref()
+                            .try_into()
+                            .expect("AES-GCM-128 key is 16 bytes"),
+                        salt: iv
+                            .as_ref()
+                            .get(..4)
+                            .expect("AES-GCM-128 salt is 4 bytes")
+                            .try_into()
+                            .expect("AES-GCM-128 salt is 4 bytes"),
+                        rec_seq: seq.to_be_bytes(),
+                    }),
+                    32 => CryptoInfo::AesGcm256(ktls::tls12_crypto_info_aes_gcm_256 {
+                        info: ktls::tls_crypto_info {
+                            version,
+                            cipher_type: ktls::TLS_CIPHER_AES_GCM_256 as _,
+                        },
+                        iv: iv
+                            .as_ref()
+                            .get(4..)
+                            .expect("AES-GCM-256 iv is 8 bytes")
+                            .try_into()
+                            .expect("AES-GCM-256 iv is 8 bytes"),
+                        key: key
+                            .as_ref()
+                            .try_into()
+                            .expect("AES-GCM-256 key is 32 bytes"),
+                        salt: iv
+                            .as_ref()
+                            .get(..4)
+                            .expect("AES-GCM-256 salt is 4 bytes")
+                            .try_into()
+                            .expect("AES-GCM-256 salt is 4 bytes"),
+                        rec_seq: seq.to_be_bytes(),
+                    }),
+                    _ => unreachable!("GCM key length is not 16 or 32"),
+                }
             }
-            ConnectionTrafficSecrets::Aes256Gcm { key, salt, iv } => {
+            ConnectionTrafficSecrets::Aes256Gcm { key, iv } => {
                 CryptoInfo::AesGcm256(ktls::tls12_crypto_info_aes_gcm_256 {
                     info: ktls::tls_crypto_info {
                         version,
                         cipher_type: ktls::TLS_CIPHER_AES_GCM_256 as _,
                     },
-                    iv,
-                    key,
-                    salt,
+                    iv: iv
+                        .as_ref()
+                        .get(4..)
+                        .expect("AES-GCM-256 iv is 8 bytes")
+                        .try_into()
+                        .expect("AES-GCM-256 iv is 8 bytes"),
+                    key: key
+                        .as_ref()
+                        .try_into()
+                        .expect("AES-GCM-256 key is 32 bytes"),
+                    salt: iv
+                        .as_ref()
+                        .get(..4)
+                        .expect("AES-GCM-256 salt is 4 bytes")
+                        .try_into()
+                        .expect("AES-GCM-256 salt is 4 bytes"),
                     rec_seq: seq.to_be_bytes(),
                 })
             }
@@ -168,8 +225,14 @@ impl CryptoInfo {
                         version,
                         cipher_type: ktls::TLS_CIPHER_CHACHA20_POLY1305 as _,
                     },
-                    iv,
-                    key,
+                    iv: iv
+                        .as_ref()
+                        .try_into()
+                        .expect("Chacha20-Poly1305 iv is 12 bytes"),
+                    key: key
+                        .as_ref()
+                        .try_into()
+                        .expect("Chacha20-Poly1305 key is 32 bytes"),
                     salt: ktls::__IncompleteArrayField::new(),
                     rec_seq: seq.to_be_bytes(),
                 })