Skip to content

Commit 06bc6fa

Browse files
authored
sha1-checked: bump digest to 0.11.0-pre.8 (#581)
1 parent e7f7317 commit 06bc6fa

File tree

4 files changed

+37
-97
lines changed

4 files changed

+37
-97
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,5 @@ opt-level = 2
3131
[patch.crates-io]
3232
# https://github.com/RustCrypto/traits/pull/1537 - Unreleased
3333
digest = { git = "https://github.com/RustCrypto/traits.git" }
34+
35+
sha1 = { path = "./sha1" }

sha1-checked/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "sha1-checked"
3-
version = "0.10.0"
3+
version = "0.11.0-pre"
44
description = "SHA-1 hash function with collision detection"
55
authors = ["RustCrypto Developers"]
66
license = "MIT OR Apache-2.0"
@@ -18,12 +18,12 @@ exclude = [
1818
]
1919

2020
[dependencies]
21-
digest = "0.10.7"
22-
sha1 = { version = "0.10.6", default-features = false, features = ["compress"] }
21+
digest = "=0.11.0-pre.8"
22+
sha1 = { version = "=0.11.0-pre.3", default-features = false }
2323
zeroize = { version = "1.7", default-features = false, optional = true }
2424

2525
[dev-dependencies]
26-
digest = { version = "0.10.7", features = ["dev"] }
26+
digest = { version = "=0.11.0-pre.8", features = ["dev"] }
2727
hex-literal = "0.4"
2828

2929
[features]

sha1-checked/src/lib.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ use core::slice::from_ref;
2727
extern crate std;
2828

2929
use digest::{
30+
array::Array,
3031
block_buffer::{BlockBuffer, Eager},
3132
core_api::BlockSizeUser,
3233
typenum::{Unsigned, U20, U64},
@@ -114,7 +115,7 @@ impl Sha1 {
114115
compress::finalize(h, bs * self.block_len, last_block, ctx);
115116
} else {
116117
let bit_len = 8 * (buffer.get_pos() as u64 + bs * self.block_len);
117-
buffer.len64_padding_be(bit_len, |b| sha1::compress(h, from_ref(b)));
118+
buffer.len64_padding_be(bit_len, |b| sha1::compress(h, from_ref(b.into())));
118119
}
119120

120121
for (chunk, v) in out.chunks_exact_mut(4).zip(h.iter()) {
@@ -187,6 +188,7 @@ impl Update for Sha1 {
187188
unsafe { &*(blocks as *const _ as *const [[u8; BLOCK_SIZE]]) };
188189
compress::compress(h, ctx, blocks);
189190
} else {
191+
let blocks = Array::cast_slice_to_core(blocks);
190192
sha1::compress(h, blocks);
191193
}
192194
});

0 commit comments

Comments
 (0)