Skip to content

Commit

Permalink
Bump cipher to v0.5.0-pre.6; digest to v0.11.0-pre.9 (#165)
Browse files Browse the repository at this point in the history
  • Loading branch information
@tarcieri
tarcieri authored Jul 26, 2024
1 parent acad3c0 commit c4afef2
Show file tree
Hide file tree
Showing 8 changed files with 76 additions and 78 deletions.
82 changes: 40 additions & 42 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[workspace]
resolver = "2"
members = [
"belt-mac",
"cbc-mac",
Expand All @@ -13,8 +14,4 @@ opt-level = 2
[patch.crates-io]
# please re-enable the minimal-versions when you remove those patches.
# https://github.com/RustCrypto/block-ciphers/pull/413
aes = { git = "https://github.com/RustCrypto/block-ciphers.git" }
belt-block = { git = "https://github.com/RustCrypto/block-ciphers.git" }
des = { git = "https://github.com/RustCrypto/block-ciphers.git" }
kuznyechik = { git = "https://github.com/RustCrypto/block-ciphers.git" }
magma = { git = "https://github.com/RustCrypto/block-ciphers.git" }
10 changes: 5 additions & 5 deletions belt-mac/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ keywords = ["crypto", "mac", "belt-mac"]
categories = ["cryptography", "no-std"]

[dependencies]
belt-block = { version = "0.2.0-pre" }
digest = { version = "=0.11.0-pre.8", features = ["mac"] }
cipher = "=0.5.0-pre.4"
belt-block = "0.2.0-pre.1"
cipher = "=0.5.0-pre.6"
digest = { version = "=0.11.0-pre.9", features = ["mac"] }

[dev-dependencies]
cipher = { version = "=0.5.0-pre.4", features = ["dev"] }
digest = { version = "=0.11.0-pre.8", features = ["dev"] }
cipher = { version = "=0.5.0-pre.6", features = ["dev"] }
digest = { version = "=0.11.0-pre.9", features = ["dev"] }
hex-literal = "0.4"

[features]
Expand Down
12 changes: 6 additions & 6 deletions cbc-mac/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ repository = "https://github.com/RustCrypto/MACs"
keywords = ["crypto", "mac", "daa"]

[dependencies]
digest = { version = "=0.11.0-pre.8", features = ["mac"] }
cipher = "=0.5.0-pre.4"
cipher = "=0.5.0-pre.6"
digest = { version = "=0.11.0-pre.9", features = ["mac"] }

[dev-dependencies]
aes = "0.9.0-pre"
des = "0.9.0-pre"
digest = { version = "=0.11.0-pre.8", features = ["dev"] }
hex-literal = "0.3"
aes = "0.9.0-pre.1"
des = "0.9.0-pre.1"
digest = { version = "=0.11.0-pre.9", features = ["dev"] }
hex-literal = "0.4"

[features]
std = ["digest/std"]
Expand Down
18 changes: 9 additions & 9 deletions cmac/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ categories = ["cryptography", "no-std"]
exclude = ["tests/cavp_large.rs", "tests/data/cavp_aes128_large.blb"]

[dependencies]
digest = { version = "=0.11.0-pre.8", features = ["mac"] }
cipher = "=0.5.0-pre.4"
dbl = "0.4.0-pre.4"
cipher = "=0.5.0-pre.6"
digest = { version = "=0.11.0-pre.9", features = ["mac"] }
dbl = "0.4.0-rc.0"

[dev-dependencies]
digest = { version = "=0.11.0-pre.8", features = ["dev"] }
hex-literal = "0.3"
aes = "0.9.0-pre"
des = "0.9.0-pre"
kuznyechik = "0.9.0-pre"
magma = "0.10.0-pre"
aes = "0.9.0-pre.1"
des = "0.9.0-pre.1"
digest = { version = "=0.11.0-pre.9", features = ["dev"] }
hex-literal = "0.4"
kuznyechik = "0.9.0-pre.1"
magma = "0.10.0-pre.1"

[features]
std = ["digest/std"]
Expand Down
12 changes: 6 additions & 6 deletions hmac/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ categories = ["cryptography", "no-std"]
rust-version = "1.72"

[dependencies]
digest = { version = "=0.11.0-pre.8", features = ["mac"] }
digest = { version = "=0.11.0-pre.9", features = ["mac"] }

[dev-dependencies]
digest = { version = "=0.11.0-pre.8", features = ["dev"] }
md-5 = { version = "=0.11.0-pre.3", default-features = false }
sha1 = { version = "=0.11.0-pre.3", default-features = false }
sha2 = { version = "=0.11.0-pre.3", default-features = false }
streebog = { version = "=0.11.0-pre.3", default-features = false }
digest = { version = "=0.11.0-pre.9", features = ["dev"] }
md-5 = { version = "=0.11.0-pre.4", default-features = false }
sha1 = { version = "=0.11.0-pre.4", default-features = false }
sha2 = { version = "=0.11.0-pre.4", default-features = false }
streebog = { version = "=0.11.0-pre.4", default-features = false }
hex-literal = "0.4"

[features]
Expand Down
10 changes: 5 additions & 5 deletions pmac/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ keywords = ["crypto", "mac", "pmac"]
categories = ["cryptography", "no-std"]

[dependencies]
digest = { version = "=0.11.0-pre.8", features = ["mac"] }
cipher = "=0.5.0-pre.4"
dbl = "0.4.0-pre.4"
cipher = "=0.5.0-pre.6"
digest = { version = "=0.11.0-pre.9", features = ["mac"] }
dbl = "0.4.0-rc.0"

[dev-dependencies]
aes = "0.9.0-pre"
digest = { version = "=0.11.0-pre.8", features = ["dev"] }
aes = "0.9.0-pre.1"
digest = { version = "=0.11.0-pre.9", features = ["dev"] }

[features]
std = ["digest/std"]
Expand Down
5 changes: 4 additions & 1 deletion pmac/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,11 +295,14 @@ where
// and migration to const generics
let mut iter = blocks.chunks_exact(B::ParBlocksSize::USIZE);
for chunk in &mut iter {
let mut tmp = ParBlocks::<B>::clone_from_slice(chunk);
let mut tmp = ParBlocks::<B>::try_from(chunk).expect("size mismatch");

for block in tmp.iter_mut() {
xor(block, state.next_offset());
}

backend.proc_par_blocks((&mut tmp).into());

for t in tmp.iter() {
xor(&mut state.tag, t);
}
Expand Down

0 comments on commit c4afef2

Please sign in to comment.