wanderer/ BLAKE3
1
0
Fork 0
mirror of https://github.com/BLAKE3-team/BLAKE3 synced 2024-05-19 00:46:06 +02:00
Code Issues Releases Activity

test `b3sum --keyed` with bad key lengths

This commit is contained in:
Jack O'Connor 2022-12-13 15:56:08 -08:00
parent 2465e0a935
commit e366618d22
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
b3sum/src/main.rs
View File

@ -304,13 +304,13 @@ fn read_key_from_stdin() -> Result<[u8; blake3::KEY_LEN]> {
.lock() .lock()
.take(blake3::KEY_LEN as u64 + 1) .take(blake3::KEY_LEN as u64 + 1)
.read_to_end(&mut bytes)?; .read_to_end(&mut bytes)?;
if n < 32 { if n < blake3::KEY_LEN {
bail!( bail!(
"expected {} key bytes from stdin, found {}", "expected {} key bytes from stdin, found {}",
blake3::KEY_LEN, blake3::KEY_LEN,
n, n,
) )
} else if n > 32 { } else if n > blake3::KEY_LEN {
bail!("read more than {} key bytes from stdin", blake3::KEY_LEN) bail!("read more than {} key bytes from stdin", blake3::KEY_LEN)
} else { } else {
Ok(bytes[..blake3::KEY_LEN].try_into().unwrap()) Ok(bytes[..blake3::KEY_LEN].try_into().unwrap())

9
b3sum/tests/cli_tests.rs
View File

@ -113,6 +113,15 @@ fn test_keyed() {
.read() .read()
.unwrap(); .unwrap();
assert_eq!(&*expected, &*output); assert_eq!(&*expected, &*output);
// Make sure that keys of the wrong length lead to errors.
for bad_length in [0, 1, blake3::KEY_LEN - 1, blake3::KEY_LEN + 1] {
dbg!(bad_length);
cmd!(b3sum_exe(), "--keyed", f.path())
.stdin_bytes(vec![0; bad_length])
.read()
.expect_err("a bad length key should fail");
}
} }
#[test] #[test]