Skip to content

uucore: upgrade md-5, sha1, sha2, sha3, digest to latest versions #12367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gabrielhnf wants to merge 1 commit into
base: main
Choose a base branch
from
+68 −80
Open

uucore: upgrade md-5, sha1, sha2, sha3, digest to latest versions #12367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 53 additions & 69 deletions Cargo.lock
View file
Open in desktop

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

17 changes: 9 additions & 8 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ members = [
[workspace.package]
categories = ["command-line-utilities"]
edition = "2024"
rust-version = "1.88.0"
rust-version = "1.89.0"
homepage = "https://github.com/uutils/coreutils"
keywords = ["coreutils", "uutils", "cross-platform", "cli", "utility"]
license = "MIT"
Expand Down Expand Up @@ -472,15 +472,16 @@ xattr = "1.3.1"
zip = { version = "8.0.0", default-features = false, features = ["deflate"] }

hex = "0.4.3"
md-5 = "0.10.6"
sha1 = "0.10.6"
sha2 = "0.10.8"
sha3 = "0.10.9"
md-5 = "0.11.0"
sha1 = "0.11.0"
sha2 = "0.11.0"
sha3 = "0.12.0"
shake = "0.1.0"
blake2b_simd = "1.0.2"
blake3 = "1.5.1"
sm3 = "0.5.0"
crc-fast = { version = "1.5.0", default-features = false }
digest = "0.10.7"
crc-fast = { version = "1.10.0", default-features = false }
digest = "0.11.0"

# Fluent dependencies
fluent = "0.17.0"
Expand Down Expand Up @@ -692,7 +693,7 @@ pretty_assertions.workspace = true
rand.workspace = true
regex.workspace = true
rustc-hash.workspace = true
sha1 = { workspace = true, features = ["std"] }
sha1 = { workspace = true }
tempfile.workspace = true
time = { workspace = true, features = ["local-offset"] }
unicode-width.workspace = true
Expand Down
2 changes: 2 additions & 0 deletions src/uucore/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ md-5 = { workspace = true, optional = true }
sha1 = { workspace = true, optional = true }
sha2 = { workspace = true, optional = true }
sha3 = { workspace = true, optional = true }
shake = { workspace = true, optional = true }
blake2b_simd = { workspace = true, optional = true }
blake3 = { workspace = true, optional = true }
sm3 = { workspace = true, optional = true }
Expand Down Expand Up @@ -189,6 +190,7 @@ sum = [
"sha1",
"sha2",
"sha3",
"shake",
"blake2b_simd",
"blake3",
"sm3",
Expand Down
7 changes: 4 additions & 3 deletions src/uucore/src/lib/features/sum.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,8 @@ macro_rules! impl_digest_common {
}

fn hash_finalize(&mut self, out: &mut [u8]) {
digest::Digest::finalize_into_reset(&mut self.0, out.into());
let result = digest::Digest::finalize_reset(&mut self.0);
out.copy_from_slice(&result);
}

fn reset(&mut self) {
Expand Down Expand Up @@ -472,11 +473,11 @@ impl_digest_common!(Sha3_384, 384);
impl_digest_common!(Sha3_512, 512);

pub struct Shake128 {
digest: sha3::Shake128,
digest: shake::Shake128,
bit_size: usize,
}
pub struct Shake256 {
digest: sha3::Shake256,
digest: shake::Shake256,
bit_size: usize,
}
impl_digest_shake!(Shake128, 256);
Expand Down