X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fcrypto.rs;h=bb5903b2c8d166783c8b6a275441282e9e7d1b27;hb=f0ecc3ec73dcdb9303b1bd5ac687a361decce2dd;hp=cdd00d92af9c5f3cd0a2fe3a61c3447310a0bba2;hpb=073f0780f6b2d72de57e5bb5a7b690c0206fa40c;p=rust-lightning

diff --git a/lightning/src/util/crypto.rs b/lightning/src/util/crypto.rs
index cdd00d92..bb5903b2 100644
--- a/lightning/src/util/crypto.rs
+++ b/lightning/src/util/crypto.rs
@@ -11,14 +11,14 @@ macro_rules! hkdf_extract_expand {
 	($salt: expr, $ikm: expr) => {{
 		let mut hmac = HmacEngine::<Sha256>::new($salt);
 		hmac.input($ikm);
-		let prk = Hmac::from_engine(hmac).into_inner();
+		let prk = Hmac::from_engine(hmac).to_byte_array();
 		let mut hmac = HmacEngine::<Sha256>::new(&prk[..]);
 		hmac.input(&[1; 1]);
-		let t1 = Hmac::from_engine(hmac).into_inner();
+		let t1 = Hmac::from_engine(hmac).to_byte_array();
 		let mut hmac = HmacEngine::<Sha256>::new(&prk[..]);
 		hmac.input(&t1);
 		hmac.input(&[2; 1]);
-		(t1, Hmac::from_engine(hmac).into_inner(), prk)
+		(t1, Hmac::from_engine(hmac).to_byte_array(), prk)
 	}};
 	($salt: expr, $ikm: expr, 2) => {{
 		let (k1, k2, _) = hkdf_extract_expand!($salt, $ikm);
@@ -30,17 +30,17 @@ macro_rules! hkdf_extract_expand {
 		let mut hmac = HmacEngine::<Sha256>::new(&prk[..]);
 		hmac.input(&k2);
 		hmac.input(&[3; 1]);
-		let k3 = Hmac::from_engine(hmac).into_inner();
+		let k3 = Hmac::from_engine(hmac).to_byte_array();
 
 		let mut hmac = HmacEngine::<Sha256>::new(&prk[..]);
 		hmac.input(&k3);
 		hmac.input(&[4; 1]);
-		let k4 = Hmac::from_engine(hmac).into_inner();
+		let k4 = Hmac::from_engine(hmac).to_byte_array();
 
 		let mut hmac = HmacEngine::<Sha256>::new(&prk[..]);
 		hmac.input(&k4);
 		hmac.input(&[5; 1]);
-		let k5 = Hmac::from_engine(hmac).into_inner();
+		let k5 = Hmac::from_engine(hmac).to_byte_array();
 
 		(k1, k2, k3, k4, k5)
 	}}