maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(nix-compat/nixhash): s/InvalidEncodedDigestLength/InvalidDigestLength/

Browse source 
This error is used for invalid digest lengths for a passed HashAlgo, not
just when they're encoded (as can be seen in from_algo_and_digest).

Change-Id: I7604846ae133df1be516a1f7ab28efd2a5775145
Reviewed-on: https://cl.snix.dev/c/snix/+/30551
Reviewed-by: Ilan Joselevich <personal@ilanjoselevich.com>
Tested-by: besadii
Autosubmit: Florian Klink <flokli@flokli.de>
This commit is contained in:
Florian Klink 2025-06-03 22:21:44 +03:00 • committed by clbot
parent 6022fb3cc2
commit 963546bd37
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
snix/nix-compat/src/nixhash/mod.rs
View file

@ -157,7 +157,7 @@ impl Serialize for NixHash {
/// the passed algo. /// the passed algo.
pub fn from_algo_and_digest(algo: HashAlgo, digest: &[u8]) -> NixHashResult<NixHash> { pub fn from_algo_and_digest(algo: HashAlgo, digest: &[u8]) -> NixHashResult<NixHash> {
if digest.len() != algo.digest_length() { if digest.len() != algo.digest_length() {
return Err(Error::InvalidEncodedDigestLength(digest.len(), algo)); return Err(Error::InvalidDigestLength(digest.len(), algo));
} }
Ok(match algo { Ok(match algo {
@ -176,7 +176,7 @@ pub enum Error {
#[error("invalid SRI string: {0}")] #[error("invalid SRI string: {0}")]
InvalidSRI(String), InvalidSRI(String),
#[error("invalid encoded digest length '{0}' for algo {1}")] #[error("invalid encoded digest length '{0}' for algo {1}")]
InvalidEncodedDigestLength(usize, HashAlgo), InvalidDigestLength(usize, HashAlgo),
#[error("invalid base16 encoding: {0}")] #[error("invalid base16 encoding: {0}")]
InvalidBase16Encoding(data_encoding::DecodeError), InvalidBase16Encoding(data_encoding::DecodeError),
#[error("invalid base32 encoding: {0}")] #[error("invalid base32 encoding: {0}")]
@ -301,7 +301,7 @@ pub fn from_sri_str(s: &str) -> NixHashResult<NixHash> {
// if the digest string is too small to fit even the BASE64_NOPAD version, bail out. // if the digest string is too small to fit even the BASE64_NOPAD version, bail out.
if digest_str.len() < BASE64_NOPAD.encode_len(algo.digest_length()) { if digest_str.len() < BASE64_NOPAD.encode_len(algo.digest_length()) {
return Err(Error::InvalidEncodedDigestLength(digest_str.len(), algo)); return Err(Error::InvalidDigestLength(digest_str.len(), algo));
} }
// trim potential padding, and use a version that does not do trailing bit // trim potential padding, and use a version that does not do trailing bit
@ -336,7 +336,7 @@ fn decode_digest(s: &[u8], algo: HashAlgo) -> NixHashResult<NixHash> {
.decode(s.as_ref()) .decode(s.as_ref())
.map_err(Error::InvalidBase64Encoding)? .map_err(Error::InvalidBase64Encoding)?
} else { } else {
Err(Error::InvalidEncodedDigestLength(s.len(), algo))? Err(Error::InvalidDigestLength(s.len(), algo))?
}; };
Ok(from_algo_and_digest(algo, &digest).unwrap()) Ok(from_algo_and_digest(algo, &digest).unwrap())