Skip to content

Commit d401a0d

Browse files
committed
uucore: upgrade md-5, sha1, sha2, sha3, digest to latest versions
1 parent 28cff68 commit d401a0d

4 files changed

Lines changed: 68 additions & 80 deletions

File tree

Cargo.lock

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

Cargo.toml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ members = [
377377
[workspace.package]
378378
categories = ["command-line-utilities"]
379379
edition = "2024"
380-
rust-version = "1.88.0"
380+
rust-version = "1.89.0"
381381
homepage = "https://github.com/uutils/coreutils"
382382
keywords = ["coreutils", "uutils", "cross-platform", "cli", "utility"]
383383
license = "MIT"
@@ -472,15 +472,16 @@ xattr = "1.3.1"
472472
zip = { version = "8.0.0", default-features = false, features = ["deflate"] }
473473

474474
hex = "0.4.3"
475-
md-5 = "0.10.6"
476-
sha1 = "0.10.6"
477-
sha2 = "0.10.8"
478-
sha3 = "0.10.9"
475+
md-5 = "0.11.0"
476+
sha1 = "0.11.0"
477+
sha2 = "0.11.0"
478+
sha3 = "0.12.0"
479+
shake = "0.1.0"
479480
blake2b_simd = "1.0.2"
480481
blake3 = "1.5.1"
481482
sm3 = "0.5.0"
482-
crc-fast = { version = "1.5.0", default-features = false }
483-
digest = "0.10.7"
483+
crc-fast = { version = "1.10.0", default-features = false }
484+
digest = "0.11.0"
484485

485486
# Fluent dependencies
486487
fluent = "0.17.0"
@@ -692,7 +693,7 @@ pretty_assertions.workspace = true
692693
rand.workspace = true
693694
regex.workspace = true
694695
rustc-hash.workspace = true
695-
sha1 = { workspace = true, features = ["std"] }
696+
sha1 = { workspace = true }
696697
tempfile.workspace = true
697698
time = { workspace = true, features = ["local-offset"] }
698699
unicode-width.workspace = true

src/uucore/Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ md-5 = { workspace = true, optional = true }
6161
sha1 = { workspace = true, optional = true }
6262
sha2 = { workspace = true, optional = true }
6363
sha3 = { workspace = true, optional = true }
64+
shake = { workspace = true, optional = true }
6465
blake2b_simd = { workspace = true, optional = true }
6566
blake3 = { workspace = true, optional = true }
6667
sm3 = { workspace = true, optional = true }
@@ -189,6 +190,7 @@ sum = [
189190
"sha1",
190191
"sha2",
191192
"sha3",
193+
"shake",
192194
"blake2b_simd",
193195
"blake3",
194196
"sm3",

src/uucore/src/lib/features/sum.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,8 @@ macro_rules! impl_digest_common {
385385
}
386386

387387
fn hash_finalize(&mut self, out: &mut [u8]) {
388-
digest::Digest::finalize_into_reset(&mut self.0, out.into());
388+
let result = digest::Digest::finalize_reset(&mut self.0);
389+
out.copy_from_slice(&result);
389390
}
390391

391392
fn reset(&mut self) {
@@ -472,11 +473,11 @@ impl_digest_common!(Sha3_384, 384);
472473
impl_digest_common!(Sha3_512, 512);
473474

474475
pub struct Shake128 {
475-
digest: sha3::Shake128,
476+
digest: shake::Shake128,
476477
bit_size: usize,
477478
}
478479
pub struct Shake256 {
479-
digest: sha3::Shake256,
480+
digest: shake::Shake256,
480481
bit_size: usize,
481482
}
482483
impl_digest_shake!(Shake128, 256);

0 commit comments

Comments
 (0)