Skip to content

Commit 60c1574

Browse files
baloobaloo
committed
bump universal-hash to 0.6.0-pre 
1 parent 6d51e01 commit 60c1574

File tree

12 files changed

+79
-57
lines changed

12 files changed

+79
-57
lines changed

‎.github/workflows/ghash.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
strategy:
2727
matrix:
2828
rust:
29-
- 1.56.1 # MSRV
29+
- 1.65.0 # MSRV
3030
- stable
3131
target:
3232
- thumbv7em-none-eabi
@@ -53,7 +53,7 @@ jobs:
5353
strategy:
5454
matrix:
5555
rust:
56-
- 1.56.1 # MSRV
56+
- 1.65.0 # MSRV
5757
- stable
5858
steps:
5959
- uses: actions/checkout@v4

‎.github/workflows/poly1305.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
strategy:
2727
matrix:
2828
rust:
29-
- 1.56.1 # MSRV
29+
- 1.65.0 # MSRV
3030
- stable
3131
target:
3232
- thumbv7em-none-eabi
@@ -48,15 +48,15 @@ jobs:
4848
include:
4949
# 32-bit Linux
5050
- target: i686-unknown-linux-gnu
51-
rust: 1.56.1 # MSRV
51+
rust: 1.65.0 # MSRV
5252
deps: sudo apt update && sudo apt install gcc-multilib
5353
- target: i686-unknown-linux-gnu
5454
rust: stable
5555
deps: sudo apt update && sudo apt install gcc-multilib
5656

5757
# 64-bit Linux
5858
- target: x86_64-unknown-linux-gnu
59-
rust: 1.56.1 # MSRV
59+
rust: 1.65.0 # MSRV
6060
- target: x86_64-unknown-linux-gnu
6161
rust: stable
6262
steps:
@@ -82,15 +82,15 @@ jobs:
8282
include:
8383
# 32-bit Linux
8484
- target: i686-unknown-linux-gnu
85-
rust: 1.56.1 # MSRV
85+
rust: 1.65.0 # MSRV
8686
deps: sudo apt update && sudo apt install gcc-multilib
8787
- target: i686-unknown-linux-gnu
8888
rust: stable
8989
deps: sudo apt update && sudo apt install gcc-multilib
9090

9191
# 64-bit Linux
9292
- target: x86_64-unknown-linux-gnu
93-
rust: 1.56.1 # MSRV
93+
rust: 1.65.0 # MSRV
9494
- target: x86_64-unknown-linux-gnu
9595
rust: stable
9696
steps:
@@ -116,15 +116,15 @@ jobs:
116116
include:
117117
# 32-bit Linux
118118
- target: i686-unknown-linux-gnu
119-
rust: 1.56.1 # MSRV
119+
rust: 1.65.0 # MSRV
120120
deps: sudo apt update && sudo apt install gcc-multilib
121121
- target: i686-unknown-linux-gnu
122122
rust: stable
123123
deps: sudo apt update && sudo apt install gcc-multilib
124124

125125
# 64-bit Linux
126126
- target: x86_64-unknown-linux-gnu
127-
rust: 1.56.1 # MSRV
127+
rust: 1.65.0 # MSRV
128128
- target: x86_64-unknown-linux-gnu
129129
rust: stable
130130
steps:

‎.github/workflows/polyval.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
strategy:
2727
matrix:
2828
rust:
29-
- 1.56.1 # MSRV
29+
- 1.65.0 # MSRV
3030
- stable
3131
target:
3232
- thumbv7em-none-eabi
@@ -48,15 +48,15 @@ jobs:
4848
include:
4949
# 32-bit Linux
5050
- target: i686-unknown-linux-gnu
51-
rust: 1.56.1 # MSRV
51+
rust: 1.65.0 # MSRV
5252
deps: sudo apt update && sudo apt install gcc-multilib
5353
- target: i686-unknown-linux-gnu
5454
rust: stable
5555
deps: sudo apt update && sudo apt install gcc-multilib
5656

5757
# 64-bit Linux
5858
- target: x86_64-unknown-linux-gnu
59-
rust: 1.56.1 # MSRV
59+
rust: 1.65.0 # MSRV
6060
- target: x86_64-unknown-linux-gnu
6161
rust: stable
6262
steps:
@@ -82,15 +82,15 @@ jobs:
8282
include:
8383
# 32-bit Linux
8484
- target: i686-unknown-linux-gnu
85-
rust: 1.56.1 # MSRV
85+
rust: 1.65.0 # MSRV
8686
deps: sudo apt update && sudo apt install gcc-multilib
8787
- target: i686-unknown-linux-gnu
8888
rust: stable
8989
deps: sudo apt update && sudo apt install gcc-multilib
9090

9191
# 64-bit Linux
9292
- target: x86_64-unknown-linux-gnu
93-
rust: 1.56.1 # MSRV
93+
rust: 1.65.0 # MSRV
9494
- target: x86_64-unknown-linux-gnu
9595
rust: stable
9696
steps:
@@ -116,15 +116,15 @@ jobs:
116116
include:
117117
# 32-bit Linux
118118
- target: i686-unknown-linux-gnu
119-
rust: 1.56.1 # MSRV
119+
rust: 1.65.0 # MSRV
120120
deps: sudo apt update && sudo apt install gcc-multilib
121121
- target: i686-unknown-linux-gnu
122122
rust: stable
123123
deps: sudo apt update && sudo apt install gcc-multilib
124124

125125
# 64-bit Linux
126126
- target: x86_64-unknown-linux-gnu
127-
rust: 1.56.1 # MSRV
127+
rust: 1.65.0 # MSRV
128128
- target: x86_64-unknown-linux-gnu
129129
rust: stable
130130
steps:

‎Cargo.lock

Lines changed: 37 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@ members = [
55
"polyval"
66
]
77
resolver = "2"
8+
9+
[patch.crates-io]
10+
universal-hash = { git = "https://github.com/RustCrypto/traits.git", branch = "master" }

‎ghash/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "ghash"
3-
version = "0.5.0"
3+
version = "0.6.0-pre"
44
authors = ["RustCrypto Developers"]
55
license = "Apache-2.0 OR MIT"
66
description = """
@@ -12,12 +12,12 @@ repository = "https://github.com/RustCrypto/universal-hashes"
1212
readme = "README.md"
1313
keywords = ["aes-gcm", "crypto", "universal-hashing"]
1414
categories = ["cryptography", "no-std"]
15-
rust-version = "1.56"
15+
rust-version = "1.65"
1616
edition = "2021"
1717

1818
[dependencies]
1919
opaque-debug = "0.3"
20-
polyval = { version = "0.6", path = "../polyval" }
20+
polyval = { version = "=0.7.0-pre", path = "../polyval" }
2121

2222
# optional dependencies
2323
zeroize = { version = "1", optional = true, default-features = false }

‎poly1305/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "poly1305"
3-
version = "0.8.0"
3+
version = "0.9.0-pre"
44
authors = ["RustCrypto Developers"]
55
license = "Apache-2.0 OR MIT"
66
description = "The Poly1305 universal hash function and message authentication code"
@@ -9,12 +9,12 @@ repository = "https://github.com/RustCrypto/universal-hashes"
99
keywords = ["crypto", "chacha20", "mac", "salsa20", "universal-hashing"]
1010
categories = ["cryptography", "no-std"]
1111
readme = "README.md"
12-
rust-version = "1.56"
12+
rust-version = "1.65"
1313
edition = "2021"
1414

1515
[dependencies]
1616
opaque-debug = "0.3"
17-
universal-hash = { version = "0.5", default-features = false }
17+
universal-hash = { version = "=0.6.0-pre", default-features = false }
1818
zeroize = { version = "1", optional = true, default-features = false }
1919

2020
[target.'cfg(any(target_arch = "x86_64", target_arch = "x86"))'.dependencies]

‎poly1305/src/backend/avx2.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
// length to be known, which is incompatible with the streaming API of UniversalHash.
1717

1818
use universal_hash::{
19+
array::Array,
1920
consts::{U16, U4},
2021
crypto_common::{BlockSizeUser, ParBlocksSizeUser},
21-
generic_array::GenericArray,
2222
UhfBackend,
2323
};
2424

@@ -160,7 +160,7 @@ impl State {
160160
}
161161

162162
// Compute tag: p + k mod 2^128
163-
let mut tag = GenericArray::<u8, _>::default();
163+
let mut tag = Array::<u8, _>::default();
164164
let tag_int = if let Some(p) = p {
165165
self.k + p
166166
} else {

‎poly1305/src/fuzz.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use universal_hash::{generic_array::GenericArray, UniversalHash};
1+
use universal_hash::{array::Array, UniversalHash};
22

33
use crate::{backend, Block, Key, BLOCK_SIZE};
44

@@ -9,7 +9,7 @@ pub fn fuzz_avx2(key: &Key, data: &[u8]) {
99

1010
for (_i, chunk) in data.chunks(BLOCK_SIZE).enumerate() {
1111
if chunk.len() == BLOCK_SIZE {
12-
let block = GenericArray::from_slice(chunk);
12+
let block = Array::from_slice(chunk);
1313
unsafe {
1414
avx2.compute_block(block, false);
1515
}
@@ -38,7 +38,7 @@ pub fn fuzz_avx2(key: &Key, data: &[u8]) {
3838
}
3939

4040
fn avx2_fuzzer_test_case(data: &[u8]) {
41-
fuzz_avx2(data[0..32].into(), &data[32..]);
41+
fuzz_avx2(Array::from_slice(&data[0..32]).into(), &data[32..]);
4242
}
4343

4444
#[test]

‎poly1305/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ extern crate std;
5454
pub use universal_hash;
5555

5656
use universal_hash::{
57+
array::Array,
5758
consts::{U16, U32},
5859
crypto_common::{BlockSizeUser, KeySizeUser},
59-
generic_array::GenericArray,
6060
KeyInit, UniversalHash,
6161
};
6262

@@ -146,7 +146,7 @@ impl Poly1305 {
146146
pub fn compute_unpadded(mut self, data: &[u8]) -> Tag {
147147
for chunk in data.chunks(BLOCK_SIZE) {
148148
if chunk.len() == BLOCK_SIZE {
149-
let block = GenericArray::from_slice(chunk);
149+
let block = Array::from_slice(chunk);
150150
self.state.compute_block(block, false);
151151
} else {
152152
let mut block = Block::default();

0 commit comments

Comments
 (0)