Merge branch 'master' into rebase2-electric-boogaloo

RustCrypto · Mar 13, 2024 · 70a9f2d · 70a9f2d
2 parents 0f494ff + fea3dd0
commit 70a9f2d
Show file tree

Hide file tree

Showing 13 changed files with 109 additions and 334 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/chacha20/Cargo.toml b/chacha20/Cargo.toml
@@ -20,15 +20,16 @@ categories = ["cryptography", "no-std"]
 
 [dependencies]
 cfg-if = "1"
-cipher = { version = "=0.5.0-pre.2", optional = true}
-rand_core = { version = "0.6.4", optional = true, default-features = false, features = ["getrandom"] }
+cipher = { version = "=0.5.0-pre.4", optional = true}
+rand_core = { version = "0.6.4", optional = true, default-features = false }
 serde = { version = "1.0", features = ["derive"], optional = true }
 zeroize = { version = "1.6.0", optional = true }
+
 [target.'cfg(any(target_arch = "x86_64", target_arch = "x86"))'.dependencies]
 cpufeatures = "0.2"
 
 [dev-dependencies]
-cipher = { version = "=0.5.0-pre.2", features = ["dev"] }
+cipher = { version = "=0.5.0-pre.4", features = ["dev"] }
 hex-literal = "0.4"
 rand_chacha = "0.3.1"
 serde_json = "1.0" # Only to test serde1

diff --git a/hc-256/Cargo.toml b/hc-256/Cargo.toml
@@ -13,10 +13,10 @@ keywords = ["crypto", "stream-cipher", "trait"]
 categories = ["cryptography", "no-std"]
 
 [dependencies]
-cipher = "=0.5.0-pre.2"
+cipher = "=0.5.0-pre.4"
 
 [dev-dependencies]
-cipher = { version = "=0.5.0-pre.2", features = ["dev"] }
+cipher = { version = "=0.5.0-pre.4", features = ["dev"] }
 hex-literal = "0.4"
 
 [features]

diff --git a/rabbit/Cargo.toml b/rabbit/Cargo.toml
@@ -13,10 +13,10 @@ keywords = ["crypto", "rabbit", "stream-cipher", "trait"]
 categories = ["cryptography", "no-std"]
 
 [dependencies]
-cipher = "=0.5.0-pre.2"
+cipher = "=0.5.0-pre.4"
 
 [dev-dependencies]
-cipher = { version = "=0.5.0-pre.2", features = ["dev"] }
+cipher = { version = "=0.5.0-pre.4", features = ["dev"] }
 hex-literal = "0.4"
 
 [features]

diff --git a/rc4/Cargo.toml b/rc4/Cargo.toml
@@ -13,7 +13,7 @@ keywords = ["arc4", "arcfour", "crypto", "stream-cipher", "trait"]
 categories = ["cryptography", "no-std"]
 
 [dependencies]
-cipher = "=0.5.0-pre.2"
+cipher = "=0.5.0-pre.4"
 
 [dev-dependencies]
 hex-literal = "0.4"

diff --git a/rc4/src/lib.rs b/rc4/src/lib.rs
@@ -15,12 +15,12 @@
 //! use rc4::{consts::*, KeyInit, StreamCipher};
 //! use rc4::{Key, Rc4};
 //!
-//! let mut rc4 = Rc4::new(b"Key".into());
+//! let mut rc4 = Rc4::<U3>::new(b"Key".into());
 //! let mut data = b"Plaintext".to_vec();
 //! rc4.apply_keystream(&mut data);
 //! assert_eq!(data, [0xBB, 0xF3, 0x16, 0xE8, 0xD9, 0x40, 0xAF, 0x0A, 0xD3]);
 //!
-//! let mut rc4 = Rc4::new(b"Wiki".into());
+//! let mut rc4 = Rc4::<U4>::new(b"Wiki".into());
 //! let mut data = b"pedia".to_vec();
 //! rc4.apply_keystream(&mut data);
 //! assert_eq!(data, [0x10, 0x21, 0xBF, 0x04, 0x20]);

diff --git a/salsa20/Cargo.toml b/salsa20/Cargo.toml
@@ -13,11 +13,10 @@ keywords = ["crypto", "stream-cipher", "trait", "xsalsa20"]
 categories = ["cryptography", "no-std"]
 
 [dependencies]
-cfg-if = "1"
-cipher = "=0.5.0-pre.2"
+cipher = "=0.5.0-pre.4"
 
 [dev-dependencies]
-cipher = { version = "=0.5.0-pre.2", features = ["dev"] }
+cipher = { version = "=0.5.0-pre.4", features = ["dev"] }
 hex-literal = "0.4"
 
 [features]

diff --git a/salsa20/src/backends.rs b/salsa20/src/backends.rs
diff --git a/salsa20/src/backends/soft.rs b/salsa20/src/backends/soft.rs
diff --git a/salsa20/src/backends/sse2.rs b/salsa20/src/backends/sse2.rs