RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

test(cksum): fix and un-ignore test_md5_bits

Browse source
This commit is contained in:
Dorian Péron 2025-02-03 02:09:45 +01:00 • committed by Dorian Peron
parent b8abebfaf9
commit f2cf08b4e6
2 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/uucore/src/lib/features/checksum.rs
View file

@ -692,7 +692,7 @@ fn identify_algo_name_and_length(
line_info: &LineInfo, line_info: &LineInfo,
algo_name_input: Option<&str>, algo_name_input: Option<&str>,
last_algo: &mut Option<String>, last_algo: &mut Option<String>,
) -> Option<(String, Option<usize>)> { ) -> Result<(String, Option<usize>), LineCheckError> {
let algo_from_line = line_info.algo_name.clone().unwrap_or_default(); let algo_from_line = line_info.algo_name.clone().unwrap_or_default();
let algorithm = algo_from_line.to_lowercase(); let algorithm = algo_from_line.to_lowercase();
*last_algo = Some(algo_from_line); *last_algo = Some(algo_from_line);
@ -701,18 +701,25 @@ fn identify_algo_name_and_length(
// (for example SHA1 (f) = d...) // (for example SHA1 (f) = d...)
// Also handle the case cksum -s sm3 but the file contains other formats // Also handle the case cksum -s sm3 but the file contains other formats
if algo_name_input.is_some() && algo_name_input != Some(&algorithm) { if algo_name_input.is_some() && algo_name_input != Some(&algorithm) {
return None; return Err(LineCheckError::ImproperlyFormatted);
} }
if !SUPPORTED_ALGORITHMS.contains(&algorithm.as_str()) { if !SUPPORTED_ALGORITHMS.contains(&algorithm.as_str()) {
// Not supported algo, leave early // Not supported algo, leave early
return None; return Err(LineCheckError::ImproperlyFormatted);
} }
let bytes = if let Some(bitlen) = line_info.algo_bit_len { let bytes = if let Some(bitlen) = line_info.algo_bit_len {
if bitlen % 8 != 0 { if algorithm != ALGORITHM_OPTIONS_BLAKE2B || bitlen % 8 != 0 {
// The given length is wrong // Either
return None; // the algo based line is provided with a bit length
// with an algorithm that does not support it (only Blake2B does).
//
// eg: MD5-128 (foo.txt) = fffffffff
// ^ This is illegal
// OR
// the given length is wrong because it's not a multiple of 8.
return Err(LineCheckError::ImproperlyFormatted);
} }
Some(bitlen / 8) Some(bitlen / 8)
} else if algorithm == ALGORITHM_OPTIONS_BLAKE2B { } else if algorithm == ALGORITHM_OPTIONS_BLAKE2B {
@ -722,7 +729,7 @@ fn identify_algo_name_and_length(
None None
}; };
Some((algorithm, bytes)) Ok((algorithm, bytes))
} }
/// Given a filename and an algorithm, compute the digest and compare it with /// Given a filename and an algorithm, compute the digest and compare it with
@ -773,8 +780,7 @@ fn process_algo_based_line(
let filename_to_check = line_info.filename.as_slice(); let filename_to_check = line_info.filename.as_slice();
let (algo_name, algo_byte_len) = let (algo_name, algo_byte_len) =
identify_algo_name_and_length(line_info, cli_algo_name, last_algo) identify_algo_name_and_length(line_info, cli_algo_name, last_algo)?;
.ok_or(LineCheckError::ImproperlyFormatted)?;
// If the digest bitlen is known, we can check the format of the expected // If the digest bitlen is known, we can check the format of the expected
// checksum with it. // checksum with it.

1
tests/by-util/test_cksum.rs
View file

@ -1136,7 +1136,6 @@ fn test_cksum_garbage() {
.stderr_contains("check-file: no properly formatted checksum lines found"); .stderr_contains("check-file: no properly formatted checksum lines found");
} }
#[ignore = "Should fail on bits"]
#[test] #[test]
fn test_md5_bits() { fn test_md5_bits() {
let (at, mut ucmd) = at_and_ucmd!(); let (at, mut ucmd) = at_and_ucmd!();