Skip to content

fix: Eliminate use of deprecated struct GenericArray #457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Pr0methean wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix: Eliminate use of deprecated struct GenericArray #457

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f73c25
fix: Eliminate use of deprecated struct GenericArray
Pr0methean Oct 26, 2025
18553e6
Use try_into to convert slice to array
Pr0methean Oct 26, 2025
f622386
Merge branch 'master' into generic-array-depr
Pr0methean Oct 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/aes_ctr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//! See [AesCtrZipKeyStream] for more information.

use crate::unstable::LittleEndianWriteExt;
use aes::cipher::generic_array::GenericArray;
Copy link
Contributor

@amazon-q-developer amazon-q-developer bot Oct 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good modernization! The removal of the deprecated GenericArray import is appropriate. The aes crate has evolved to accept slice types directly, making the GenericArray wrapper unnecessary.

use aes::cipher::{BlockEncrypt, KeyInit};
use std::{any, fmt};

Expand Down Expand Up @@ -92,7 +91,7 @@ where
pub fn new(key: &[u8]) -> AesCtrZipKeyStream<C> {
AesCtrZipKeyStream {
counter: 1,
cipher: C::Cipher::new(GenericArray::from_slice(key)),
cipher: C::Cipher::new(key.try_into().expect("invalid key length")),
buffer: [0u8; AES_BLOCK_SIZE],
pos: AES_BLOCK_SIZE,
}
Expand All @@ -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);
Copy link
Contributor

@amazon-q-developer amazon-q-developer bot Oct 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perfect modernization! The direct use of &mut self.buffer instead of GenericArray::from_mut_slice(&mut self.buffer) is much more idiomatic. The BlockEncrypt::encrypt_block method now accepts mutable slice references directly, eliminating the need for the GenericArray wrapper.

self.counter += 1;
self.pos = 0;
}
Expand Down
Loading