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

Explicitly clear t0 in KDF macro

Browse Source
This commit is contained in:
Mathias Hall-Andersen
2019-08-31 15:52:41 +02:00
parent 7e5852ec26
commit c823af1a9c
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/handshake/noise.rs
View File

@@ -17,7 +17,9 @@ use rand::{CryptoRng, RngCore};
use generic_array::typenum::*; use generic_array::typenum::*;
use generic_array::*; use generic_array::*;
use clear_on_drop::clear::Clear;
use clear_on_drop::clear_stack_on_return; use clear_on_drop::clear_stack_on_return;
use subtle::ConstantTimeEq; use subtle::ConstantTimeEq;
use super::device::Device; use super::device::Device;
@@ -85,27 +87,30 @@ macro_rules! HMAC {
macro_rules! KDF1 { macro_rules! KDF1 {
($ck:expr, $input:expr) => {{ ($ck:expr, $input:expr) => {{
let t0 = HMAC!($ck, $input); let mut t0 = HMAC!($ck, $input);
let t1 = HMAC!(&t0, &[0x1]); let t1 = HMAC!(&t0, &[0x1]);
t0.clear();
t1 t1
}}; }};
} }
macro_rules! KDF2 { macro_rules! KDF2 {
($ck:expr, $input:expr) => {{ ($ck:expr, $input:expr) => {{
let t0 = HMAC!($ck, $input); let mut t0 = HMAC!($ck, $input);
let t1 = HMAC!(&t0, &[0x1]); let t1 = HMAC!(&t0, &[0x1]);
let t2 = HMAC!(&t0, &t1, &[0x2]); let t2 = HMAC!(&t0, &t1, &[0x2]);
t0.clear();
(t1, t2) (t1, t2)
}}; }};
} }
macro_rules! KDF3 { macro_rules! KDF3 {
($ck:expr, $input:expr) => {{ ($ck:expr, $input:expr) => {{
let t0 = HMAC!($ck, $input); let mut t0 = HMAC!($ck, $input);
let t1 = HMAC!(&t0, &[0x1]); let t1 = HMAC!(&t0, &[0x1]);
let t2 = HMAC!(&t0, &t1, &[0x2]); let t2 = HMAC!(&t0, &t1, &[0x2]);
let t3 = HMAC!(&t0, &t2, &[0x3]); let t3 = HMAC!(&t0, &t2, &[0x3]);
t0.clear();
(t1, t2, t3) (t1, t2, t3)
}}; }};
} }