bump universal-hash to 0.6.0-pre

RustCrypto · Feb 29, 2024 · 38707e7 · 38707e7
1 parent 6d51e01
commit 38707e7
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 26 deletions.
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
@@ -17,7 +17,7 @@ edition = "2021"
 
 [dependencies]
 opaque-debug = "0.3"
-polyval = { version = "0.6", 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"
@@ -14,7 +14,7 @@ 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/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();

diff --git a/polyval/Cargo.toml b/polyval/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polyval"
-version = "0.6.1"
+version = "0.7.0-pre"
 authors = ["RustCrypto Developers"]
 license = "Apache-2.0 OR MIT"
 description = """
@@ -18,7 +18,7 @@ edition = "2021"
 [dependencies]
 cfg-if = "1"
 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 = "aarch64", target_arch = "x86_64", target_arch = "x86"))'.dependencies]