Merge branch 'master' into rebase2-electric-boogaloo

RustCrypto · Jan 17, 2024 · 9d3d870 · 9d3d870
2 parents 758a0b7 + 521d874
commit 9d3d870
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/chacha20/src/legacy.rs b/chacha20/src/legacy.rs
@@ -10,7 +10,6 @@ use cipher::{
 
 /// Nonce type used by [`ChaCha20Legacy`].
 pub type LegacyNonce = Array<u8, U8>;
-
 use crate::variants::Legacy;
 
 /// The ChaCha20 stream cipher (legacy "djb" construction with 64-bit nonce).

diff --git a/chacha20/src/xchacha.rs b/chacha20/src/xchacha.rs
@@ -6,11 +6,6 @@ use cipher::{
     BlockSizeUser, IvSizeUser, KeyIvInit, KeySizeUser, StreamCipherCoreWrapper, StreamClosure,
 };
 
-use crate::{
-    variants::Ietf, ChaChaCore, Rounds, StreamCipherCore, StreamCipherSeekCore, CONSTANTS, R12,
-    R20, R8, STATE_WORDS,
-};
-
 #[cfg(feature = "zeroize")]
 use zeroize::ZeroizeOnDrop;
 
@@ -195,7 +190,7 @@ mod hchacha20_tests {
             "82413b4227b27bfed30e42508a877d73"
             "a0f9e4d58a74a853c12ec41326d3ecdc"
         );
-
+      
         let actual = hchacha::<R20>(
             Array::from_slice(&KEY),
             Array::from_slice(&INPUT),