From b9517de86ecdb3c949f1c71e6caf3e10c95d80e9 Mon Sep 17 00:00:00 2001
From: Jason Ish <jason.ish@oisf.net>
Date: Wed, 15 Oct 2025 14:26:44 -0600
Subject: [PATCH] rust: update aes to 0.8.4

---
 rust/Cargo.lock.in      | 40 +++++++++++++++++++++++++++++++++++-----
 rust/Cargo.toml.in      |  2 +-
 rust/src/quic/crypto.rs |  3 +--
 3 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/rust/Cargo.lock.in b/rust/Cargo.lock.in
index 01a80a7749..95d2eae5d7 100644
--- a/rust/Cargo.lock.in
+++ b/rust/Cargo.lock.in
@@ -24,11 +24,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
 dependencies = [
  "cfg-if",
- "cipher",
+ "cipher 0.3.0",
  "cpufeatures",
  "opaque-debug",
 ]
 
+[[package]]
+name = "aes"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
+dependencies = [
+ "cfg-if",
+ "cipher 0.4.4",
+ "cpufeatures",
+]
+
 [[package]]
 name = "aes-gcm"
 version = "0.9.4"
@@ -36,8 +47,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6"
 dependencies = [
  "aead",
- "aes",
- "cipher",
+ "aes 0.7.5",
+ "cipher 0.3.0",
  "ctr",
  "ghash",
  "subtle",
@@ -268,6 +279,16 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+]
+
 [[package]]
 name = "clap"
 version = "4.5.48"
@@ -358,7 +379,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea"
 dependencies = [
- "cipher",
+ "cipher 0.3.0",
 ]
 
 [[package]]
@@ -702,6 +723,15 @@ dependencies = [
  "hashbrown 0.16.0",
 ]
 
+[[package]]
+name = "inout"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "ipsec-parser"
 version = "0.7.0"
@@ -1523,7 +1553,7 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 name = "suricata"
 version = "9.0.0-dev"
 dependencies = [
- "aes",
+ "aes 0.8.4",
  "aes-gcm",
  "asn1-rs 0.6.2",
  "base64",
diff --git a/rust/Cargo.toml.in b/rust/Cargo.toml.in
index fdcb0c9a4e..a8faff82b6 100644
--- a/rust/Cargo.toml.in
+++ b/rust/Cargo.toml.in
@@ -51,7 +51,7 @@ widestring = "~0.4.3"
 flate2 = { version = "~1.0.35", features = ["zlib"] }
 brotli = "~8.0.1"
 hkdf = "~0.12.4"
-aes = "~0.7.5"
+aes = "~0.8.4"
 aes-gcm = "~0.9.4"
 lru = "~0.12.5"
 
diff --git a/rust/src/quic/crypto.rs b/rust/src/quic/crypto.rs
index d40e845274..fe5d723ab5 100644
--- a/rust/src/quic/crypto.rs
+++ b/rust/src/quic/crypto.rs
@@ -16,9 +16,8 @@
  */
 
 use aes::cipher::generic_array::GenericArray;
+use aes::cipher::{BlockEncrypt, KeyInit};
 use aes::Aes128;
-use aes::BlockEncrypt;
-use aes::NewBlockCipher;
 use aes_gcm::AeadInPlace;
 use aes_gcm::Aes128Gcm;
 use aes_gcm::NewAead;