From 8f73c255ab723ff177d9c58de97663aee22e8789 Mon Sep 17 00:00:00 2001 From: hennickc Date: Sun, 26 Oct 2025 14:27:47 -0700 Subject: [PATCH 1/2] fix: Eliminate use of deprecated struct GenericArray --- src/aes_ctr.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/aes_ctr.rs b/src/aes_ctr.rs index 6513fb978..886e7ca2a 100644 --- a/src/aes_ctr.rs +++ b/src/aes_ctr.rs @@ -5,7 +5,6 @@ //! See [AesCtrZipKeyStream] for more information. use crate::unstable::LittleEndianWriteExt; -use aes::cipher::generic_array::GenericArray; use aes::cipher::{BlockEncrypt, KeyInit}; use std::{any, fmt}; @@ -92,7 +91,7 @@ where pub fn new(key: &[u8]) -> AesCtrZipKeyStream { AesCtrZipKeyStream { counter: 1, - cipher: C::Cipher::new(GenericArray::from_slice(key)), + cipher: C::Cipher::new(key.into()), buffer: [0u8; AES_BLOCK_SIZE], pos: AES_BLOCK_SIZE, } @@ -114,8 +113,7 @@ where .as_mut() .write_u128_le(self.counter) .expect("did not expect u128 le conversion to fail"); - self.cipher - .encrypt_block(GenericArray::from_mut_slice(&mut self.buffer)); + self.cipher.encrypt_block(&mut self.buffer); self.counter += 1; self.pos = 0; } From 18553e6ea673c9d3b14071f6c825b6fde0a80571 Mon Sep 17 00:00:00 2001 From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> Date: Sun, 26 Oct 2025 14:48:51 -0700 Subject: [PATCH 2/2] Use try_into to convert slice to array Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Signed-off-by: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> --- src/aes_ctr.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/aes_ctr.rs b/src/aes_ctr.rs index 886e7ca2a..9468067cb 100644 --- a/src/aes_ctr.rs +++ b/src/aes_ctr.rs @@ -91,7 +91,7 @@ where pub fn new(key: &[u8]) -> AesCtrZipKeyStream { AesCtrZipKeyStream { counter: 1, - cipher: C::Cipher::new(key.into()), + cipher: C::Cipher::new(key.try_into().expect("invalid key length")), buffer: [0u8; AES_BLOCK_SIZE], pos: AES_BLOCK_SIZE, }