util(cksum): Add support for sha2 and sha3

Author: RenjiSann

src/uu/cksum/locales/en-US.ftl

@@ -8,10 +8,8 @@ cksum-after-help = DIGEST determines the digest algorithm and default output for
   - crc32b: (only available through cksum)
   - md5: (equivalent to md5sum)
   - sha1: (equivalent to sha1sum)
-  - sha224: (equivalent to sha224sum)
-  - sha256: (equivalent to sha256sum)
-  - sha384: (equivalent to sha384sum)
-  - sha512: (equivalent to sha512sum)
+  - sha2: (equivalent to sha{"{224,256,384,512}"}sum)
+  - sha3: (only available through cksum)
   - blake2b: (equivalent to b2sum)
   - sm3: (only available through cksum)
 

src/uu/cksum/locales/fr-FR.ftl

@@ -8,10 +8,8 @@ cksum-after-help = DIGEST détermine l'algorithme de condensé et le format de s
   - crc32b : (disponible uniquement via cksum)
   - md5 : (équivalent à md5sum)
   - sha1 : (équivalent à sha1sum)
-  - sha224 : (équivalent à sha224sum)
-  - sha256 : (équivalent à sha256sum)
-  - sha384 : (équivalent à sha384sum)
-  - sha512 : (équivalent à sha512sum)
+  - sha2: (équivalent à sha{"{224,256,384,512}"}sum)
+  - sha3 : (disponible uniquement via cksum)
   - blake2b : (équivalent à b2sum)
   - sm3 : (disponible uniquement via cksum)
 

src/uu/cksum/src/cksum.rs

@@ -14,9 +14,10 @@ use std::iter;
 use std::path::Path;
 use uucore::checksum::{
     ALGORITHM_OPTIONS_BLAKE2B, ALGORITHM_OPTIONS_BSD, ALGORITHM_OPTIONS_CRC,
-    ALGORITHM_OPTIONS_CRC32B, ALGORITHM_OPTIONS_SYSV, ChecksumError, ChecksumOptions,
-    ChecksumVerbose, HashAlgorithm, LEGACY_ALGORITHMS, SUPPORTED_ALGORITHMS,
-    calculate_blake2b_length, detect_algo, digest_reader, perform_checksum_validation,
+    ALGORITHM_OPTIONS_CRC32B, ALGORITHM_OPTIONS_SHA2, ALGORITHM_OPTIONS_SHA3,
+    ALGORITHM_OPTIONS_SYSV, ChecksumError, ChecksumOptions, ChecksumVerbose, HashAlgorithm,
+    LEGACY_ALGORITHMS, SUPPORTED_ALGORITHMS, calculate_blake2b_length, detect_algo, digest_reader,
+    perform_checksum_validation,
 };
 use uucore::translate;
 
@@ -382,13 +383,16 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
 
     let input_length = matches.get_one::<usize>(options::LENGTH);
 
-    let length = match input_length {
-        None | Some(0) => None,
-        Some(length) if algo_name == ALGORITHM_OPTIONS_BLAKE2B => {
-            calculate_blake2b_length(*length)?
-        }
+    let length = match (input_length, algo_name) {
+        // Length for sha2 and sha3 should be saved, it will be validated
+        // afterwards if necessary.
+        (Some(len), ALGORITHM_OPTIONS_SHA2 | ALGORITHM_OPTIONS_SHA3) => Some(*len),
+        (None | Some(0), _) => None,
+        // Length for Blake2b if saved only if it's not zero.
+        (Some(len), ALGORITHM_OPTIONS_BLAKE2B) => calculate_blake2b_length(*len)?,
+        // a --length flag set with any other algorithm is an error.
         _ => {
-            return Err(ChecksumError::LengthOnlyForBlake2b.into());
+            return Err(ChecksumError::LengthOnlyForBlake2bSha2Sha3.into());
         }
     };
 

src/uu/hashsum/src/hashsum.rs

@@ -101,7 +101,7 @@ fn create_algorithm_from_flags(matches: &ArgMatches) -> UResult<HashAlgorithm> {
     if matches.get_flag("sha3") {
         match matches.get_one::<usize>("bits") {
             Some(bits) => set_or_err(create_sha3(*bits)?)?,
-            None => return Err(ChecksumError::BitsRequiredForSha3.into()),
+            None => return Err(ChecksumError::LengthRequired("SHA3".into()).into()),
         }
     }
     if matches.get_flag("sha3-224") {
@@ -139,7 +139,7 @@ fn create_algorithm_from_flags(matches: &ArgMatches) -> UResult<HashAlgorithm> {
                 create_fn: Box::new(|| Box::new(Shake128::new())),
                 bits: *bits,
             })?,
-            None => return Err(ChecksumError::BitsRequiredForShake128.into()),
+            None => return Err(ChecksumError::LengthRequired("SHAKE128".into()).into()),
         }
     }
     if matches.get_flag("shake256") {
@@ -149,7 +149,7 @@ fn create_algorithm_from_flags(matches: &ArgMatches) -> UResult<HashAlgorithm> {
                 create_fn: Box::new(|| Box::new(Shake256::new())),
                 bits: *bits,
             })?,
-            None => return Err(ChecksumError::BitsRequiredForShake256.into()),
+            None => return Err(ChecksumError::LengthRequired("SHAKE256".into()).into()),
         }
     }