rixxc/wireguard-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update the blake2 crate to fix bug upstream

Browse Source 
Included basic sanity check for the HKDF macroes, to avoid regression in future.
This commit is contained in:
Mathias Hall-Andersen
2019-08-26 15:00:14 +02:00
parent 2272e5250f
commit 5f3c4d2e27
3 changed files with 182 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/handshake/noise.rs
View File

@@ -157,15 +157,81 @@ mod tests {
const IDENTIFIER: &[u8] = b"WireGuard v1 zx2c4 Jason@zx2c4.com";
const CONSTRUCTION: &[u8] = b"Noise_IKpsk2_25519_ChaChaPoly_BLAKE2s";
/* Sanity check precomputed initial chain key
*/
#[test]
fn precomputed_chain_key() {
assert_eq!(INITIAL_CK[..], HASH!(CONSTRUCTION)[..]);
}
/* Sanity check precomputed initial hash transcript
*/
#[test]
fn precomputed_hash() {
assert_eq!(INITIAL_HS[..], HASH!(INITIAL_CK, IDENTIFIER)[..]);
}
/* Sanity check the HKDF macro
*
* Test vectors generated using WireGuard-Go
*/
#[test]
fn hkdf() {
let tests: Vec<(Vec<u8>, Vec<u8>, [u8; 32], [u8; 32], [u8; 32])> = vec![
(
vec![],
vec![],
[
0x83, 0x87, 0xb4, 0x6b, 0xf4, 0x3e, 0xcc, 0xfc, 0xf3, 0x49, 0x55, 0x2a, 0x09,
0x5d, 0x83, 0x15, 0xc4, 0x05, 0x5b, 0xeb, 0x90, 0x20, 0x8f, 0xb1, 0xbe, 0x23,
0xb8, 0x94, 0xbc, 0x2e, 0xd5, 0xd0,
],
[
0x58, 0xa0, 0xe5, 0xf6, 0xfa, 0xef, 0xcc, 0xf4, 0x80, 0x7b, 0xff, 0x1f, 0x05,
0xfa, 0x8a, 0x92, 0x17, 0x94, 0x57, 0x62, 0x04, 0x0b, 0xce, 0xc2, 0xf4, 0xb4,
0xa6, 0x2b, 0xdf, 0xe0, 0xe8, 0x6e,
],
[
0x0c, 0xe6, 0xea, 0x98, 0xec, 0x54, 0x8f, 0x8e, 0x28, 0x1e, 0x93, 0xe3, 0x2d,
0xb6, 0x56, 0x21, 0xc4, 0x5e, 0xb1, 0x8d, 0xc6, 0xf0, 0xa7, 0xad, 0x94, 0x17,
0x86, 0x10, 0xa2, 0xf7, 0x33, 0x8e,
],
),
(
vec![0xde, 0xad, 0xbe, 0xef],
vec![],
[
0x55, 0x32, 0x9d, 0xc8, 0x0e, 0x69, 0x0f, 0xd8, 0x6b, 0xd9, 0x66, 0x1f, 0x08,
0x51, 0xc9, 0xb3, 0x68, 0x6d, 0xf2, 0xb1, 0xfd, 0xa0, 0x34, 0x7b, 0xc3, 0xd2,
0x79, 0x58, 0x25, 0x4b, 0x32, 0xc6,
],
[
0x8d, 0xfc, 0x6d, 0x33, 0xa8, 0x11, 0x8f, 0xfe, 0x40, 0x8b, 0x31, 0xdd, 0xac,
0x25, 0xf7, 0x2a, 0xee, 0x91, 0x15, 0xa4, 0x5b, 0x69, 0xba, 0x17, 0x6a, 0xd0,
0x12, 0xb2, 0x43, 0x83, 0x4f, 0xee,
],
[
0xd6, 0x9e, 0x85, 0x2a, 0x28, 0x96, 0x56, 0x9e, 0xa5, 0x4a, 0x67, 0x96, 0x9a,
0xa1, 0x80, 0x02, 0x87, 0x92, 0x1d, 0xac, 0x53, 0xce, 0x6d, 0xb4, 0xb4, 0xe1,
0x21, 0x92, 0xf2, 0x63, 0xc4, 0xc4,
],
),
];
for (key, input, t0, t1, t2) in &tests {
let tt0 = KDF1!(key, input);
debug_assert_eq!(tt0[..], t0[..]);
let (tt0, tt1) = KDF2!(key, input);
debug_assert_eq!(tt0[..], t0[..]);
debug_assert_eq!(tt1[..], t1[..]);
let (tt0, tt1, tt2) = KDF3!(key, input);
debug_assert_eq!(tt0[..], t0[..]);
debug_assert_eq!(tt1[..], t1[..]);
debug_assert_eq!(tt2[..], t2[..]);
}
}
}
pub fn create_initiation<T: Copy, R: RngCore + CryptoRng>(