Migrate to new version of cipher (#436)

newpavlov · web-flow · commit ffdbbeed5bc9 · 2025-08-15T04:53:53.000+03:00
diff --git a/.github/workflows/chacha20.yml b/.github/workflows/chacha20.yml
@@ -41,6 +41,7 @@ jobs:
       - run: cargo build --target ${{ matrix.target }} --features zeroize
 
   minimal-versions:
+    if: false # TODO: temp disabled due to unpublished prerelease dependencies
     uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
     with:
       working-directory: ${{ github.workflow }}
diff --git a/.github/workflows/hc-256.yml b/.github/workflows/hc-256.yml
@@ -39,6 +39,7 @@ jobs:
       - run: cargo build --target ${{ matrix.target }} --features zeroize
 
   minimal-versions:
+    if: false # TODO: temp disabled due to unpublished prerelease dependencies
     uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
     with:
         working-directory: ${{ github.workflow }}
diff --git a/.github/workflows/rabbit.yml b/.github/workflows/rabbit.yml
@@ -38,6 +38,7 @@ jobs:
       - run: cargo build --target ${{ matrix.target }} --features zeroize
 
   minimal-versions:
+    if: false # TODO: temp disabled due to unpublished prerelease dependencies
     uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
     with:
         working-directory: ${{ github.workflow }}
diff --git a/.github/workflows/rc4.yml b/.github/workflows/rc4.yml
@@ -38,6 +38,7 @@ jobs:
       - run: cargo build --target ${{ matrix.target }} --features zeroize
 
   minimal-versions:
+    if: false # TODO: temp disabled due to unpublished prerelease dependencies
     uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
     with:
         working-directory: ${{ github.workflow }}
diff --git a/.github/workflows/salsa20.yml b/.github/workflows/salsa20.yml
@@ -38,6 +38,7 @@ jobs:
       - run: cargo build --target ${{ matrix.target }} --features zeroize
 
   minimal-versions:
+    if: false # TODO: temp disabled due to unpublished prerelease dependencies
     uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
     with:
         working-directory: ${{ github.workflow }}
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,3 +10,11 @@ members = [
 
 [profile.dev]
 opt-level = 2
+
+[patch.crates-io]
+# https://github.com/RustCrypto/utils/pull/1187
+blobby = { git = "https://github.com/RustCrypto/utils" }
+# https://github.com/RustCrypto/traits/pull/1959
+cipher = { git = "https://github.com/RustCrypto/traits" }
+# https://github.com/RustCrypto/utils/pull/1201
+block-buffer = { git = "https://github.com/RustCrypto/utils" }
diff --git a/chacha20/Cargo.toml b/chacha20/Cargo.toml
@@ -20,7 +20,7 @@ rand_core-compatible RNGs based on those ciphers.
 
 [dependencies]
 cfg-if = "1"
-cipher = { version = "0.5.0-rc.0", optional = true }
+cipher = { version = "0.5.0-rc.0", optional = true, features = ["stream-wrapper"] }
 rand_core = { version = "0.9", optional = true, default-features = false }
 serde = { version = "1.0", features = ["derive"], optional = true }
 
diff --git a/hc-256/Cargo.toml b/hc-256/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["cryptography", "no-std"]
 description = "Pure Rust implementation of the HC-256 stream cipher"
 
 [dependencies]
-cipher = "0.5.0-rc.0"
+cipher = { version = "0.5.0-rc.0", features = ["stream-wrapper"] }
 
 [dev-dependencies]
 cipher = { version = "0.5.0-rc.0", features = ["dev"] }
diff --git a/rabbit/Cargo.toml b/rabbit/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["cryptography", "no-std"]
 description = "Pure Rust implementation of the Rabbit stream cipher"
 
 [dependencies]
-cipher = "0.5.0-rc.0"
+cipher = { version = "0.5.0-rc.0", features = ["stream-wrapper"] }
 
 [dev-dependencies]
 cipher = { version = "0.5.0-rc.0", features = ["dev"] }
diff --git a/rc4/Cargo.toml b/rc4/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["cryptography", "no-std"]
 description = "Pure Rust implementation of the RC4 stream cipher"
 
 [dependencies]
-cipher = "0.5.0-rc.0"
+cipher = { version = "0.5.0-rc.0", features = ["stream-wrapper"] }
 
 [dev-dependencies]
 hex-literal = "1"
diff --git a/salsa20/Cargo.toml b/salsa20/Cargo.toml
@@ -14,7 +14,7 @@ description = "Pure Rust implementation of the Salsa20 stream cipher"
 
 [dependencies]
 cfg-if = "1"
-cipher = "0.5.0-rc.0"
+cipher = { version = "0.5.0-rc.0", features = ["stream-wrapper"] }
 
 [dev-dependencies]
 cipher = { version = "0.5.0-rc.0", features = ["dev"] }
diff --git a/salsa20/tests/ecrypt.rs b/salsa20/tests/ecrypt.rs
@@ -1,26 +1,29 @@
 use cipher::{KeyIvInit, StreamCipher, StreamCipherSeek, blobby};
 use salsa20::Salsa20;
 
-static DATA: &[u8] = include_bytes!("data/ecrypt.blb");
-
 /// ECRYPT test vectors:
 /// https://github.com/das-labor/legacy/blob/master/microcontroller-2/arm-crypto-lib/testvectors/salsa20-256.64-verified.test-vectors
 #[test]
 fn salsa20_ecrypt() {
-    let test_vectors = blobby::Blob4Iterator::new(DATA).unwrap();
-    for test_vector in test_vectors {
-        let [key, iv, pos, expected] = test_vector.unwrap();
+    blobby::parse_into_structs!(
+        include_bytes!("data/ecrypt.blb");
+        #[define_struct]
+        static TEST_VECTORS: &[
+            TestVector { key, iv, pos, expected }
+        ];
+    );
 
-        let key = key.try_into().unwrap();
-        let iv = iv.try_into().unwrap();
-        let pos = u32::from_be_bytes(pos.try_into().unwrap());
+    for tv in TEST_VECTORS {
+        let key = tv.key.try_into().unwrap();
+        let iv = tv.iv.try_into().unwrap();
+        let pos = u32::from_be_bytes(tv.pos.try_into().unwrap());
 
         let mut c = Salsa20::new(key, iv);
         c.seek(pos);
 
         let mut buf = [0u8; 64];
         c.apply_keystream(&mut buf);
 
-        assert_eq!(buf, expected);
+        assert_eq!(buf, tv.expected);
     }
 }
