diff --git a/src/blake2b.rs b/src/blake2b.rs index eb946cc1..e483d938 100644 --- a/src/blake2b.rs +++ b/src/blake2b.rs @@ -215,6 +215,41 @@ impl Blake2b { b } + pub fn new_keyed_salt_personal(outlen: usize, + key: &[u8], + salt: &[u8], + personal: &[u8]) + -> Blake2b { + assert!(outlen > 0 && outlen <= BLAKE2B_OUTBYTES); + assert!(key.len() > 0 && key.len() <= BLAKE2B_KEYBYTES); + assert!(salt.len() > 0 && salt.len() <= BLAKE2B_SALTBYTES); + assert!(personal.len() > 0 && personal.len() <= BLAKE2B_PERSONALBYTES); + + let mut bp = [0; BLAKE2B_PERSONALBYTES]; + bp[..personal.len()].clone_from_slice(&personal); + + let mut bs = [0; BLAKE2B_SALTBYTES]; + bs[..salt.len()].clone_from_slice(&salt); + + let param = Blake2bParam { + digest_length: outlen as u8, + key_length: key.len() as u8, + fanout: 1, + depth: 1, + leaf_length: 0, + node_offset: 0, + node_depth: 0, + inner_length: 0, + reserved: [0; 14], + salt: bs, + personal: bp, + }; + + let mut b = Blake2b::init_param(param, key); + b.apply_key(); + b + } + fn compress(&mut self) { let mut ms: [u64; 16] = [0; 16]; let mut vs: [u64; 16] = [0; 16]; @@ -495,6 +530,77 @@ mod digest_tests { test_hash(&tests[..]); } + + #[test] + fn test_blake2b_keyed_salt_personal() { + let expected: [[u8; 64]; 10] = + [[0xa0, 0xc7, 0x24, 0x40, 0x47, 0x28, 0xc8, 0xbb, 0x95, 0xe5, 0x43, 0x3e, 0xb6, 0xa9, + 0x71, 0x61, 0x71, 0x14, 0x4d, 0x61, 0xef, 0xb2, 0x3e, 0x74, 0xb8, 0x73, 0xfc, 0xbe, + 0xda, 0x51, 0xd8, 0x07, 0x1b, 0x5d, 0x70, 0xaa, 0xe1, 0x20, 0x66, 0xdf, 0xc9, 0x4c, + 0xe9, 0x43, 0xf1, 0x45, 0xaa, 0x17, 0x6c, 0x05, 0x50, 0x40, 0xc3, 0xdd, 0x73, 0xb0, + 0xa1, 0x5e, 0x36, 0x25, 0x4d, 0x45, 0x06, 0x14], + [0x02, 0x50, 0x7f, 0x14, 0x4f, 0xa9, 0xbf, 0x19, 0x01, 0x0b, 0xf7, 0xc7, 0x0b, 0x23, + 0x5b, 0x4c, 0x26, 0x63, 0xcc, 0x00, 0xe0, 0x74, 0xf9, 0x29, 0x60, 0x2a, 0x5e, 0x2c, + 0x10, 0xa7, 0x80, 0x75, 0x7d, 0x2a, 0x39, 0x93, 0xd0, 0x6d, 0xeb, 0xc3, 0x78, 0xa9, + 0x0e, 0xfd, 0xac, 0x19, 0x6d, 0xd8, 0x41, 0x81, 0x7b, 0x97, 0x7d, 0x67, 0xb7, 0x86, + 0x80, 0x4f, 0x6d, 0x3c, 0xd5, 0x85, 0xba, 0xb5], + [0x19, 0x44, 0xda, 0x61, 0xff, 0x18, 0xdc, 0x20, 0x28, 0xc3, 0x57, 0x8a, 0xc8, 0x5b, + 0xe9, 0x04, 0x93, 0x1b, 0x83, 0x86, 0x08, 0x96, 0x59, 0x8f, 0x62, 0x46, 0x8f, 0x1c, + 0xb5, 0x47, 0x1c, 0x6a, 0x34, 0x4c, 0x94, 0x5d, 0xbc, 0x62, 0xc9, 0xaa, 0xf7, 0x0f, + 0xeb, 0x62, 0x47, 0x2d, 0x17, 0x77, 0x5e, 0xa5, 0xdb, 0x6e, 0xd5, 0x49, 0x4c, 0x68, + 0xb7, 0xa9, 0xa5, 0x97, 0x61, 0xf3, 0x96, 0x14], + [0x13, 0x1c, 0x0c, 0xa1, 0x63, 0x3e, 0xd0, 0x74, 0x98, 0x62, 0x15, 0xb2, 0x64, 0xf6, + 0xe0, 0x47, 0x4f, 0x36, 0x2c, 0x52, 0xb0, 0x29, 0xef, 0xfc, 0x7b, 0x0f, 0x75, 0x97, + 0x7e, 0xe8, 0x9c, 0xc9, 0x5d, 0x85, 0xc3, 0xdb, 0x87, 0xf7, 0xe3, 0x99, 0x19, 0x7a, + 0x25, 0x41, 0x15, 0x92, 0xbe, 0xee, 0xb7, 0xe5, 0x12, 0x8a, 0x74, 0x64, 0x6a, 0x46, + 0x0e, 0xcd, 0x6d, 0xeb, 0x49, 0x94, 0xb7, 0x1e], + [0xa7, 0x02, 0x3a, 0x0b, 0xf9, 0xbe, 0x24, 0x5d, 0x07, 0x8a, 0xed, 0x26, 0xbc, 0xde, + 0x04, 0x65, 0xff, 0x0c, 0xc0, 0x96, 0x11, 0x96, 0xa5, 0x48, 0x2a, 0x0f, 0xf4, 0xff, + 0x8b, 0x40, 0x15, 0x97, 0x1e, 0x13, 0x61, 0x1f, 0x50, 0x52, 0x9c, 0xb4, 0x08, 0xf5, + 0x77, 0x6b, 0x14, 0xa9, 0x0e, 0x7c, 0x3d, 0xd9, 0x16, 0x0a, 0x22, 0x21, 0x1d, 0xb6, + 0x4f, 0xf4, 0xb5, 0xc0, 0xb9, 0x95, 0x36, 0x80], + [0x50, 0xf4, 0x93, 0x13, 0xf3, 0xa0, 0x5b, 0x2e, 0x56, 0x5c, 0x13, 0xfe, 0xed, 0xb4, + 0x4d, 0xaa, 0x67, 0x5c, 0xaf, 0xd4, 0x2c, 0x2b, 0x2c, 0xf9, 0xed, 0xbc, 0xe9, 0xc9, + 0x49, 0xfb, 0xfc, 0x3f, 0x17, 0x5d, 0xcb, 0x73, 0x86, 0x71, 0x50, 0x9a, 0xe2, 0xea, + 0x66, 0xfb, 0x85, 0xe5, 0x52, 0x39, 0x4d, 0x47, 0x9a, 0xfa, 0x7f, 0xa3, 0xaf, 0xfe, + 0x87, 0x91, 0x74, 0x47, 0x96, 0xb9, 0x41, 0x76], + [0x13, 0xb5, 0x8d, 0x6d, 0x69, 0x78, 0x00, 0x89, 0x29, 0x38, 0x62, 0xcd, 0x59, 0xa1, + 0xa8, 0xa4, 0xef, 0x79, 0xbb, 0x85, 0x0e, 0x3f, 0x3b, 0xa4, 0x1f, 0xb2, 0x24, 0x46, + 0xa7, 0xdd, 0x1d, 0xc4, 0xda, 0x46, 0x67, 0xd3, 0x7b, 0x33, 0xbf, 0x12, 0x25, 0xdc, + 0xf8, 0x17, 0x3c, 0x4c, 0x34, 0x9a, 0x5d, 0x91, 0x1c, 0x5b, 0xd2, 0xdb, 0x9c, 0x59, + 0x05, 0xed, 0x70, 0xc1, 0x1e, 0x80, 0x9e, 0x3b], + [0x15, 0xd4, 0x4b, 0x4b, 0x44, 0xff, 0xa0, 0x06, 0xee, 0xce, 0xeb, 0x50, 0x8c, 0x98, + 0xa9, 0x70, 0xaa, 0xa5, 0x73, 0xd6, 0x59, 0x05, 0x68, 0x7b, 0x9e, 0x15, 0x85, 0x4d, + 0xec, 0x6d, 0x49, 0xc6, 0x12, 0x75, 0x7e, 0x14, 0x9f, 0x78, 0x26, 0x8f, 0x72, 0x76, + 0x60, 0xde, 0xdf, 0x9a, 0xbc, 0xe2, 0x2a, 0x96, 0x91, 0xfe, 0xb2, 0x0a, 0x01, 0xb0, + 0x52, 0x5f, 0x4b, 0x47, 0xa3, 0xcf, 0x19, 0xdb], + [0x9a, 0xeb, 0xba, 0x11, 0xc5, 0x42, 0x8a, 0xe8, 0x22, 0x57, 0x16, 0x36, 0x9e, 0x30, + 0xa4, 0x89, 0x43, 0xbe, 0x39, 0x15, 0x9a, 0x89, 0x9f, 0x80, 0x4e, 0x99, 0x63, 0xef, + 0x78, 0x82, 0x2e, 0x18, 0x6c, 0x21, 0xfe, 0x95, 0xbb, 0x0b, 0x85, 0xe6, 0x0e, 0xf0, + 0x3a, 0x6f, 0x58, 0xd0, 0xb9, 0xd0, 0x6e, 0x91, 0xf7, 0x9d, 0x0a, 0xb9, 0x98, 0x45, + 0x0b, 0x88, 0x10, 0xc7, 0x3c, 0xa9, 0x35, 0xb4], + [0x70, 0xf9, 0xb8, 0x3e, 0x46, 0x3f, 0xb4, 0x41, 0xe7, 0xa4, 0xc4, 0x32, 0x75, 0x12, + 0x5c, 0xd5, 0xb1, 0x9d, 0x8e, 0x2e, 0x4a, 0x5d, 0x17, 0x9a, 0x39, 0xf5, 0xdb, 0x10, + 0xbb, 0xce, 0x74, 0x5a, 0x19, 0x91, 0x04, 0x56, 0x3d, 0x30, 0x8c, 0xf8, 0xd4, 0xc6, + 0xb2, 0x7b, 0xbb, 0x75, 0x9d, 0xed, 0x23, 0x2f, 0x5b, 0xdb, 0x7c, 0x36, 0x7d, 0xd6, + 0x32, 0xa9, 0x67, 0x73, 0x20, 0xdf, 0xe4, 0x16]]; + + for i in 0..10 { + let mut sh = + Blake2b::new_keyed_salt_personal(64, + &[0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, + 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, + 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, + 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, + 0x1c, 0x1d, 0x1e, 0x1f], + &[i, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], + &"KDF test".as_bytes()); + let mut out = [0u8; 64]; + sh.result(&mut out); + assert_eq!(out.to_vec(), expected[i as usize].to_vec()); + } + } }