bump universal-hash to 0.6.0-pre

RustCrypto · Mar 5, 2024 · 894cf78 · 894cf78
1 parent 655c6cb
commit 894cf78
Show file tree

Hide file tree

Showing 12 changed files with 79 additions and 57 deletions.
diff --git a/.github/workflows/ghash.yml b/.github/workflows/ghash.yml
@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.56.1 # MSRV
+          - 1.65.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -53,7 +53,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.56.1 # MSRV
+          - 1.65.0 # MSRV
           - stable
     steps:
     - uses: actions/checkout@v4

diff --git a/.github/workflows/poly1305.yml b/.github/workflows/poly1305.yml
@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.56.1 # MSRV
+          - 1.65.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -48,15 +48,15 @@ jobs:
         include:
           # 32-bit Linux
           - target: i686-unknown-linux-gnu
-            rust: 1.56.1 # MSRV
+            rust: 1.65.0 # MSRV
             deps: sudo apt update && sudo apt install gcc-multilib
           - target: i686-unknown-linux-gnu
             rust: stable
             deps: sudo apt update && sudo apt install gcc-multilib
 
           # 64-bit Linux
           - target: x86_64-unknown-linux-gnu
-            rust: 1.56.1 # MSRV
+            rust: 1.65.0 # MSRV
           - target: x86_64-unknown-linux-gnu
             rust: stable
     steps:
@@ -82,15 +82,15 @@ jobs:
         include:
           # 32-bit Linux
           - target: i686-unknown-linux-gnu
-            rust: 1.56.1 # MSRV
+            rust: 1.65.0 # MSRV
             deps: sudo apt update && sudo apt install gcc-multilib
           - target: i686-unknown-linux-gnu
             rust: stable
             deps: sudo apt update && sudo apt install gcc-multilib
 
           # 64-bit Linux
           - target: x86_64-unknown-linux-gnu
-            rust: 1.56.1 # MSRV
+            rust: 1.65.0 # MSRV
           - target: x86_64-unknown-linux-gnu
             rust: stable
     steps:
@@ -116,15 +116,15 @@ jobs:
         include:
           # 32-bit Linux
           - target: i686-unknown-linux-gnu
-            rust: 1.56.1 # MSRV
+            rust: 1.65.0 # MSRV
             deps: sudo apt update && sudo apt install gcc-multilib
           - target: i686-unknown-linux-gnu
             rust: stable
             deps: sudo apt update && sudo apt install gcc-multilib
 
           # 64-bit Linux
           - target: x86_64-unknown-linux-gnu
-            rust: 1.56.1 # MSRV
+            rust: 1.65.0 # MSRV
           - target: x86_64-unknown-linux-gnu
             rust: stable
     steps:

diff --git a/.github/workflows/polyval.yml b/.github/workflows/polyval.yml
@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.56.1 # MSRV
+          - 1.65.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -48,15 +48,15 @@ jobs:
         include:
           # 32-bit Linux
           - target: i686-unknown-linux-gnu
-            rust: 1.56.1 # MSRV
+            rust: 1.65.0 # MSRV
             deps: sudo apt update && sudo apt install gcc-multilib
           - target: i686-unknown-linux-gnu
             rust: stable
             deps: sudo apt update && sudo apt install gcc-multilib
 
           # 64-bit Linux
           - target: x86_64-unknown-linux-gnu
-            rust: 1.56.1 # MSRV
+            rust: 1.65.0 # MSRV
           - target: x86_64-unknown-linux-gnu
             rust: stable
     steps:
@@ -82,15 +82,15 @@ jobs:
         include:
           # 32-bit Linux
           - target: i686-unknown-linux-gnu
-            rust: 1.56.1 # MSRV
+            rust: 1.65.0 # MSRV
             deps: sudo apt update && sudo apt install gcc-multilib
           - target: i686-unknown-linux-gnu
             rust: stable
             deps: sudo apt update && sudo apt install gcc-multilib
 
           # 64-bit Linux
           - target: x86_64-unknown-linux-gnu
-            rust: 1.56.1 # MSRV
+            rust: 1.65.0 # MSRV
           - target: x86_64-unknown-linux-gnu
             rust: stable
     steps:
@@ -116,15 +116,15 @@ jobs:
         include:
           # 32-bit Linux
           - target: i686-unknown-linux-gnu
-            rust: 1.56.1 # MSRV
+            rust: 1.65.0 # MSRV
             deps: sudo apt update && sudo apt install gcc-multilib
           - target: i686-unknown-linux-gnu
             rust: stable
             deps: sudo apt update && sudo apt install gcc-multilib
 
           # 64-bit Linux
           - target: x86_64-unknown-linux-gnu
-            rust: 1.56.1 # MSRV
+            rust: 1.65.0 # MSRV
           - target: x86_64-unknown-linux-gnu
             rust: stable
     steps:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,3 +5,6 @@ members = [
     "polyval"
 ]
 resolver = "2"
+
+[patch.crates-io]
+universal-hash = { git = "https://github.com/RustCrypto/traits.git", branch = "master" }
diff --git a/ghash/Cargo.toml b/ghash/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ghash"
-version = "0.5.1"
+version = "0.6.0-pre"
 authors = ["RustCrypto Developers"]
 license = "Apache-2.0 OR MIT"
 description = """
@@ -12,12 +12,12 @@ repository = "https://github.com/RustCrypto/universal-hashes"
 readme = "README.md"
 keywords = ["aes-gcm", "crypto", "universal-hashing"]
 categories = ["cryptography", "no-std"]
-rust-version = "1.56"
+rust-version = "1.65"
 edition = "2021"
 
 [dependencies]
 opaque-debug = "0.3"
-polyval = { version = "0.6.2", path = "../polyval" }
+polyval = { version = "=0.7.0-pre", path = "../polyval" }
 
 # optional dependencies
 zeroize = { version = "1", optional = true, default-features = false }

diff --git a/poly1305/Cargo.toml b/poly1305/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "poly1305"
-version = "0.8.0"
+version = "0.9.0-pre"
 authors = ["RustCrypto Developers"]
 license = "Apache-2.0 OR MIT"
 description = "The Poly1305 universal hash function and message authentication code"
@@ -9,12 +9,12 @@ repository = "https://github.com/RustCrypto/universal-hashes"
 keywords = ["crypto", "chacha20", "mac", "salsa20", "universal-hashing"]
 categories = ["cryptography", "no-std"]
 readme = "README.md"
-rust-version = "1.56"
+rust-version = "1.65"
 edition = "2021"
 
 [dependencies]
 opaque-debug = "0.3"
-universal-hash = { version = "0.5", default-features = false }
+universal-hash = { version = "=0.6.0-pre", default-features = false }
 zeroize = { version = "1", optional = true, default-features = false }
 
 [target.'cfg(any(target_arch = "x86_64", target_arch = "x86"))'.dependencies]

diff --git a/poly1305/src/backend/avx2.rs b/poly1305/src/backend/avx2.rs
@@ -16,9 +16,9 @@
 // length to be known, which is incompatible with the streaming API of UniversalHash.
 
 use universal_hash::{
+    array::Array,
     consts::{U16, U4},
     crypto_common::{BlockSizeUser, ParBlocksSizeUser},
-    generic_array::GenericArray,
     UhfBackend,
 };
 
@@ -160,7 +160,7 @@ impl State {
         }
 
         // Compute tag: p + k mod 2^128
-        let mut tag = GenericArray::<u8, _>::default();
+        let mut tag = Array::<u8, _>::default();
         let tag_int = if let Some(p) = p {
             self.k + p
         } else {

diff --git a/poly1305/src/fuzz.rs b/poly1305/src/fuzz.rs
@@ -1,4 +1,4 @@
-use universal_hash::{generic_array::GenericArray, UniversalHash};
+use universal_hash::{array::Array, UniversalHash};
 
 use crate::{backend, Block, Key, BLOCK_SIZE};
 
@@ -9,7 +9,7 @@ pub fn fuzz_avx2(key: &Key, data: &[u8]) {
 
     for (_i, chunk) in data.chunks(BLOCK_SIZE).enumerate() {
         if chunk.len() == BLOCK_SIZE {
-            let block = GenericArray::from_slice(chunk);
+            let block = Array::from_slice(chunk);
             unsafe {
                 avx2.compute_block(block, false);
             }
@@ -38,7 +38,7 @@ pub fn fuzz_avx2(key: &Key, data: &[u8]) {
 }
 
 fn avx2_fuzzer_test_case(data: &[u8]) {
-    fuzz_avx2(data[0..32].into(), &data[32..]);
+    fuzz_avx2(Array::from_slice(&data[0..32]).into(), &data[32..]);
 }
 
 #[test]

diff --git a/poly1305/src/lib.rs b/poly1305/src/lib.rs
@@ -54,9 +54,9 @@ extern crate std;
 pub use universal_hash;
 
 use universal_hash::{
+    array::Array,
     consts::{U16, U32},
     crypto_common::{BlockSizeUser, KeySizeUser},
-    generic_array::GenericArray,
     KeyInit, UniversalHash,
 };
 
@@ -146,7 +146,7 @@ impl Poly1305 {
     pub fn compute_unpadded(mut self, data: &[u8]) -> Tag {
         for chunk in data.chunks(BLOCK_SIZE) {
             if chunk.len() == BLOCK_SIZE {
-                let block = GenericArray::from_slice(chunk);
+                let block = Array::from_slice(chunk);
                 self.state.compute_block(block, false);
             } else {
                 let mut block = Block::default();