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
8 changes: 7 additions & 1 deletion native/rust/cose_openssl/src/cbor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,14 @@ pub enum CborValue {
impl CborValue {
/// Parse CBOR bytes into an owned `CborValue`.
pub fn from_bytes(bytes: &[u8]) -> Result<Self, String> {
let (item, _) = cbor_nondet_parse(None, false, bytes)
let (item, remainder) = cbor_nondet_parse(None, false, bytes)
.ok_or("Failed to parse CBOR bytes")?;
if !remainder.is_empty() {
return Err(format!(
"Trailing bytes: {} unconsumed byte(s)",
remainder.len()
));
}
Self::from_raw(item)
}

Expand Down
27 changes: 27 additions & 0 deletions native/rust/cose_openssl/src/cose.rs
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,33 @@ mod tests {
assert!(cose_verify1(&key, &envelope, None).unwrap());
}

#[test]
fn cose_verify1_rejects_trailing_bytes() {
let key = EvpKey::new(KeyType::EC(WhichEC::P256)).unwrap();
let phdr_bytes = hex_decode(TEST_PHDR);
let phdr = CborValue::from_bytes(&phdr_bytes).unwrap();
let uhdr = CborValue::Map(vec![]);
let payload = b"Good boy...";

let envelope = cose_sign1(&key, phdr, uhdr, payload, false).unwrap();

// Sanity: valid envelope verifies.
assert!(cose_verify1(&key, &envelope, None).unwrap());

// Append a redundant trailing byte.
let mut bad_envelope = envelope.clone();
bad_envelope.push(0x00);

// Verification of the envelope with trailing bytes should fail
// (either return an error or reject the signature).
let result = cose_verify1(&key, &bad_envelope, None);
assert!(
result.is_err(),
"Expected error with trailing byte, got: {:?}",
result,
);
}

#[cfg(feature = "pqc")]
mod pqc_tests {
use super::*;
Expand Down
Loading