X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fln%2Fpeer_channel_encryptor.rs;h=67b0a14cb168910bc97e472dce26ba2c95e4645f;hb=b21048a1ce25c69a1b6167715a51a5116fe61e6d;hp=2de38e68f8a0dd7ff297cd2e63a23fc43dde559c;hpb=b94365f3f560b095350bd36d4eb9bf63268679b0;p=rust-lightning

diff --git a/src/ln/peer_channel_encryptor.rs b/src/ln/peer_channel_encryptor.rs
index 2de38e68..67b0a14c 100644
--- a/src/ln/peer_channel_encryptor.rs
+++ b/src/ln/peer_channel_encryptor.rs
@@ -5,16 +5,14 @@ use secp256k1::Secp256k1;
 use secp256k1::key::{PublicKey,SecretKey};
 use secp256k1::ecdh::SharedSecret;
 
-use rand::{thread_rng,Rng};
-
 use crypto::digest::Digest;
 use crypto::hkdf::{hkdf_extract,hkdf_expand};
-use crypto::sha2::Sha256;
 
 use crypto::aead::{AeadEncryptor, AeadDecryptor};
 
 use util::chacha20poly1305rfc::ChaCha20Poly1305RFC;
-use util::byte_utils;
+use util::{byte_utils,rng};
+use util::sha2::Sha256;
 
 // Sha256("Noise_XK_secp256k1_ChaChaPoly_SHA256")
 const NOISE_CK: [u8; 32] = [0x26, 0x40, 0xf5, 0x2e, 0xeb, 0xcd, 0x9e, 0x88, 0x29, 0x58, 0x95, 0x1c, 0x79, 0x42, 0x50, 0xee, 0xdb, 0x28, 0x00, 0x2c, 0x05, 0xd7, 0xdc, 0x2e, 0xa0, 0xf1, 0x95, 0x40, 0x60, 0x42, 0xca, 0xf1];
@@ -75,9 +73,8 @@ pub struct PeerChannelEncryptor {
 
 impl PeerChannelEncryptor {
 	pub fn new_outbound(their_node_id: PublicKey) -> PeerChannelEncryptor {
-		let mut rng = thread_rng();
 		let mut key = [0u8; 32];
-		rng.fill_bytes(&mut key);
+		rng::fill_bytes(&mut key);
 
 		let secp_ctx = Secp256k1::new();
 		let sec_key = SecretKey::from_slice(&secp_ctx, &key).unwrap(); //TODO: nicer rng-is-bad error message
@@ -157,12 +154,11 @@ impl PeerChannelEncryptor {
 
 	#[inline]
 	fn hkdf(state: &mut BidirectionalNoiseState, ss: SharedSecret) -> [u8; 32] {
-		let sha = Sha256::new();
 		let mut hkdf = [0; 64];
 		{
 			let mut prk = [0; 32];
-			hkdf_extract(sha, &state.ck, &ss[..], &mut prk);
-			hkdf_expand(sha, &prk, &[0;0], &mut hkdf);
+			hkdf_extract(Sha256::new(), &state.ck, &ss[..], &mut prk);
+			hkdf_expand(Sha256::new(), &prk, &[0;0], &mut hkdf);
 		}
 		state.ck.copy_from_slice(&hkdf[0..32]);
 		let mut res = [0; 32];
@@ -276,9 +272,8 @@ impl PeerChannelEncryptor {
 	pub fn process_act_one_with_key(&mut self, act_one: &[u8], our_node_secret: &SecretKey) -> Result<[u8; 50], HandleError> {
 		assert_eq!(act_one.len(), 50);
 
-		let mut rng = thread_rng();
 		let mut key = [0u8; 32];
-		rng.fill_bytes(&mut key);
+		rng::fill_bytes(&mut key);
 		let our_ephemeral_key = SecretKey::from_slice(&self.secp_ctx, &key).unwrap(); //TODO: nicer rng-is-bad error message
 		self.process_act_one_with_ephemeral_key(act_one, our_node_secret, our_ephemeral_key)
 	}
@@ -313,10 +308,9 @@ impl PeerChannelEncryptor {
 
 						PeerChannelEncryptor::encrypt_with_ad(&mut res[50..], 0, &temp_k, &bidirectional_state.h, &[0; 0]);
 
-						sha.reset();
 						let mut prk = [0; 32];
-						hkdf_extract(sha, &bidirectional_state.ck, &[0; 0], &mut prk);
-						hkdf_expand(sha, &prk, &[0;0], &mut final_hkdf);
+						hkdf_extract(Sha256::new(), &bidirectional_state.ck, &[0; 0], &mut prk);
+						hkdf_expand(Sha256::new(), &prk, &[0;0], &mut final_hkdf);
 						ck = bidirectional_state.ck.clone();
 						res
 					},
@@ -375,10 +369,9 @@ impl PeerChannelEncryptor {
 
 						PeerChannelEncryptor::decrypt_with_ad(&mut [0; 0], 0, &temp_k, &bidirectional_state.h, &act_three[50..])?;
 
-						sha.reset();
 						let mut prk = [0; 32];
-						hkdf_extract(sha, &bidirectional_state.ck, &[0; 0], &mut prk);
-						hkdf_expand(sha, &prk, &[0;0], &mut final_hkdf);
+						hkdf_extract(Sha256::new(), &bidirectional_state.ck, &[0; 0], &mut prk);
+						hkdf_expand(Sha256::new(), &prk, &[0;0], &mut final_hkdf);
 						ck = bidirectional_state.ck.clone();
 					},
 					_ => panic!("Wrong direction for act"),
@@ -416,11 +409,10 @@ impl PeerChannelEncryptor {
 		match self.noise_state {
 			NoiseState::Finished { ref mut sk, ref mut sn, ref mut sck, rk: _, rn: _, rck: _ } => {
 				if *sn >= 1000 {
-					let mut sha = Sha256::new();
 					let mut prk = [0; 32];
-					hkdf_extract(sha, sck, sk, &mut prk);
+					hkdf_extract(Sha256::new(), sck, sk, &mut prk);
 					let mut hkdf = [0; 64];
-					hkdf_expand(sha, &prk, &[0;0], &mut hkdf);
+					hkdf_expand(Sha256::new(), &prk, &[0;0], &mut hkdf);
 
 					sck[..].copy_from_slice(&hkdf[0..32]);
 					sk[..].copy_from_slice(&hkdf[32..]);
@@ -447,11 +439,10 @@ impl PeerChannelEncryptor {
 		match self.noise_state {
 			NoiseState::Finished { sk: _, sn: _, sck: _, ref mut rk, ref mut rn, ref mut rck } => {
 				if *rn >= 1000 {
-					let mut sha = Sha256::new();
 					let mut prk = [0; 32];
-					hkdf_extract(sha, rck, rk, &mut prk);
+					hkdf_extract(Sha256::new(), rck, rk, &mut prk);
 					let mut hkdf = [0; 64];
-					hkdf_expand(sha, &prk, &[0;0], &mut hkdf);
+					hkdf_expand(Sha256::new(), &prk, &[0;0], &mut hkdf);
 
 					rck[..].copy_from_slice(&hkdf[0..32]);
 					rk[..].copy_from_slice(&hkdf[32..]);
@@ -752,7 +743,7 @@ mod tests {
 			let res = outbound_peer.encrypt_message(&msg);
 			assert_eq!(res.len(), 5 + 2*16 + 2);
 
-			let mut len_header = res[0..2+16].to_vec();
+			let len_header = res[0..2+16].to_vec();
 			assert_eq!(inbound_peer.decrypt_length_header(&len_header[..]).unwrap() as usize, msg.len());
 			assert_eq!(inbound_peer.decrypt_message(&res[2+16..]).unwrap()[..], msg[..]);