Skip to content

cksum: Back support for -a blake3 and -a shake* #10031

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
oech3 wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −24
Open

cksum: Back support for -a blake3 and -a shake* #10031

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
9 changes: 7 additions & 2 deletions src/uu/cksum/src/cksum.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,14 @@ fn maybe_sanitize_length(
sanitize_sha2_sha3_length_str(algo, s_len).map(Some)
}

// For BLAKE2b, if a length is provided, validate it.
// For BLAKE2b and SHAKE, if a length is provided, validate it.
(Some(AlgoKind::Blake2b), Some(len)) => calculate_blake2b_length_str(len),

(Some(AlgoKind::Shake128 | AlgoKind::Shake256), Some(s_len)) => {
let len = s_len
.parse::<usize>()
.map_err(|_| ChecksumError::InvalidLength(s_len.to_string()))?;
Ok(Some(len))
}
// For any other provided algorithm, check if length is 0.
// Otherwise, this is an error.
(_, Some(len)) if len.parse::<u32>() == Ok(0_u32) => Ok(None),
Expand Down
3 changes: 0 additions & 3 deletions src/uu/hashsum/locales/en-US.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@ hashsum-help-sha3-224 = work with SHA3-224
hashsum-help-sha3-256 = work with SHA3-256
hashsum-help-sha3-384 = work with SHA3-384
hashsum-help-sha3-512 = work with SHA3-512
hashsum-help-shake128 = work with SHAKE128 using BITS for the output size
hashsum-help-shake256 = work with SHAKE256 using BITS for the output size
hashsum-help-b2sum = work with BLAKE2
hashsum-help-b3sum = work with BLAKE3

# Error messages
hashsum-error-failed-to-read-input = failed to read input
3 changes: 0 additions & 3 deletions src/uu/hashsum/locales/fr-FR.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@ hashsum-help-sha3-224 = travailler avec SHA3-224
hashsum-help-sha3-256 = travailler avec SHA3-256
hashsum-help-sha3-384 = travailler avec SHA3-384
hashsum-help-sha3-512 = travailler avec SHA3-512
hashsum-help-shake128 = travailler avec SHAKE128 en utilisant BITS pour la taille de sortie
hashsum-help-shake256 = travailler avec SHAKE256 en utilisant BITS pour la taille de sortie
hashsum-help-b2sum = travailler avec BLAKE2
hashsum-help-b3sum = travailler avec BLAKE3

# Messages d'erreur
hashsum-error-failed-to-read-input = échec de la lecture de l'entrée
12 changes: 0 additions & 12 deletions src/uu/hashsum/src/hashsum.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,6 @@ fn create_algorithm_from_flags(matches: &ArgMatches) -> UResult<(AlgoKind, Optio
if matches.get_flag("b2sum") {
set_or_err((AlgoKind::Blake2b, None))?;
}
if matches.get_flag("b3sum") {
set_or_err((AlgoKind::Blake3, None))?;
}
if matches.get_flag("sha3") {
match matches.get_one::<String>(options::LENGTH) {
Some(len) => set_or_err((
Expand All @@ -96,12 +93,6 @@ fn create_algorithm_from_flags(matches: &ArgMatches) -> UResult<(AlgoKind, Optio
if matches.get_flag("sha3-512") {
set_or_err((AlgoKind::Sha3, Some(512)))?;
}
if matches.get_flag("shake128") {
set_or_err((AlgoKind::Shake128, Some(128)))?;
}
if matches.get_flag("shake256") {
set_or_err((AlgoKind::Shake256, Some(256)))?;
}

if alg.is_none() {
return Err(ChecksumError::NeedAlgorithmToHash.into());
Expand Down Expand Up @@ -374,10 +365,7 @@ pub fn uu_app_custom() -> Command {
("sha3-256", translate!("hashsum-help-sha3-256")),
("sha3-384", translate!("hashsum-help-sha3-384")),
("sha3-512", translate!("hashsum-help-sha3-512")),
("shake128", translate!("hashsum-help-shake128")),
("shake256", translate!("hashsum-help-shake256")),
("b2sum", translate!("hashsum-help-b2sum")),
("b3sum", translate!("hashsum-help-b3sum")),
];

for (name, desc) in algorithms {
Expand Down
7 changes: 6 additions & 1 deletion src/uucore/src/lib/features/checksum/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ pub enum AlgoKind {
Sha384,
Sha512,

// Not available in cksum
// Extension
Shake128,
Shake256,
Blake3,
Expand Down Expand Up @@ -114,6 +114,11 @@ impl AlgoKind {
ALGORITHM_OPTIONS_SHA256 => Sha256,
ALGORITHM_OPTIONS_SHA384 => Sha384,
ALGORITHM_OPTIONS_SHA512 => Sha512,

// Extension
ALGORITHM_OPTIONS_BLAKE3 => Blake3,
ALGORITHM_OPTIONS_SHAKE128 => Shake128,
ALGORITHM_OPTIONS_SHAKE256 => Shake256,
_ => return Err(ChecksumError::UnknownAlgorithm(algo.as_ref().to_string()).into()),
})
}
Expand Down
3 changes: 0 additions & 3 deletions tests/by-util/test_hashsum.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,6 @@ macro_rules! test_digest_with_len {

test_digest! {md5, md5}
test_digest! {sha1, sha1}
test_digest! {b3sum, b3sum}
test_digest! {shake128, shake128}
test_digest! {shake256, shake256}

test_digest_with_len! {sha224, sha224, 224}
test_digest_with_len! {sha256, sha256, 256}
Expand Down
Loading