Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion api/src/sign/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,11 @@ pub fn gather_signature_data(
return Err(SignaturesError::Empty.into());
}

let signature_bytes = HEADER_SIZE + keys.len() * SIGNATURE_LENGTH;
let signature_bytes = keys
.len()
.checked_mul(SIGNATURE_LENGTH)
.and_then(|s| s.checked_add(HEADER_SIZE))
.ok_or(SignaturesError::TooManyKeys)?;
if signature_bytes > BUF_LIMIT {
return Err(SignaturesError::TooManyKeys.into());
}
Expand Down
6 changes: 5 additions & 1 deletion api/src/sign/zip.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@ where
if keys.len() > SignatureCountLeInt::MAX as usize {
return Err(Error::TooManyKeys.into());
}
let signature_bytes = SIGNATURE_LENGTH * keys.len() + HEADER_SIZE;
let signature_bytes = keys
.len()
.checked_mul(SIGNATURE_LENGTH)
.and_then(|s| s.checked_add(HEADER_SIZE))
.ok_or(Error::TooManyKeys)?;
if signature_bytes > BUF_LIMIT {
return Err(Error::TooManyKeys.into());
}
Expand Down
4 changes: 3 additions & 1 deletion api/src/verify/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,9 @@ where
if signature_count == 0 {
return Err(SignaturesError::Empty.into());
}
let signature_bytes = signature_count * SIGNATURE_LENGTH;
let signature_bytes = signature_count
.checked_mul(SIGNATURE_LENGTH)
.ok_or(SignaturesError::MagicHeader)?;
if signature_bytes > BUF_LIMIT {
return Err(SignaturesError::MagicHeader.into());
}
Expand Down
6 changes: 6 additions & 0 deletions api/src/verify_unsign_tar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,12 @@ where
if data[..GZIP_START.len()] != *GZIP_START {
return Err(TarReadSignaturesError::Gzip);
}
// `base64` already ensures that no `NUL` was contained in the input. A `NUL` would mean that
// the signature data was broken / contained inside another `DEFLATE` block. I don't think
// forging a `.tar.gz` file this way could be used for an attack, anyway, because an empty
// `DEFLATE` block cannot contain data. Being "empty" and "containing data" at the same time …
// But without any `NUL` check, `zipsign-api` could possibly say "this file is fine", when it's
// actually broken.
let Ok(data) = BASE64_STANDARD.decode(&data[GZIP_START.len()..]) else {
return Err(TarReadSignaturesError::Base64);
};
Expand Down