X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fln%2Fpeer_channel_encryptor.rs;h=f72c0dbe6b3f530c209739984923aa91814e60c2;hb=ab22bed7edfdf14e234fd333267b700ba59b093a;hp=ceb9ccb7872f622d9403ccda36ed50c62f3bc6b5;hpb=6185a2819090bd077954244c5e2adaab5efcaa1a;p=rust-lightning diff --git a/src/ln/peer_channel_encryptor.rs b/src/ln/peer_channel_encryptor.rs index ceb9ccb7..f72c0dbe 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 @@ -150,19 +147,18 @@ impl PeerChannelEncryptor { let mut chacha = ChaCha20Poly1305RFC::new(key, &nonce, h); if !chacha.decrypt(&cyphertext[0..cyphertext.len() - 16], res, &cyphertext[cyphertext.len() - 16..]) { - return Err(HandleError{err: "Bad MAC", msg: Some(msgs::ErrorMessage::DisconnectPeer{})}); + return Err(HandleError{err: "Bad MAC", action: Some(msgs::ErrorAction::DisconnectPeer{ msg: None })}); } Ok(()) } #[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]; @@ -199,11 +195,11 @@ impl PeerChannelEncryptor { assert_eq!(act.len(), 50); if act[0] != 0 { - return Err(HandleError{err: "Unknown handshake version number", msg: Some(msgs::ErrorMessage::DisconnectPeer{})}); + return Err(HandleError{err: "Unknown handshake version number", action: Some(msgs::ErrorAction::DisconnectPeer{ msg: None })}); } let their_pub = match PublicKey::from_slice(secp_ctx, &act[1..34]) { - Err(_) => return Err(HandleError{err: "Invalid public key", msg: Some(msgs::ErrorMessage::DisconnectPeer{})}), + Err(_) => return Err(HandleError{err: "Invalid public key", action: Some(msgs::ErrorAction::DisconnectPeer{ msg: None })}), Ok(key) => key, }; @@ -216,7 +212,7 @@ impl PeerChannelEncryptor { let temp_k = PeerChannelEncryptor::hkdf(state, ss); let mut dec = [0; 0]; - try!(PeerChannelEncryptor::decrypt_with_ad(&mut dec, 0, &temp_k, &state.h, &act[34..])); + PeerChannelEncryptor::decrypt_with_ad(&mut dec, 0, &temp_k, &state.h, &act[34..])?; sha.reset(); sha.input(&state.h); @@ -257,7 +253,7 @@ impl PeerChannelEncryptor { panic!("Requested act at wrong step"); } - let (their_pub, _) = try!(PeerChannelEncryptor::inbound_noise_act(&self.secp_ctx, bidirectional_state, act_one, &our_node_secret)); + let (their_pub, _) = PeerChannelEncryptor::inbound_noise_act(&self.secp_ctx, bidirectional_state, act_one, &our_node_secret)?; ie.get_or_insert(their_pub); re.get_or_insert(our_ephemeral); @@ -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) } @@ -296,7 +291,7 @@ impl PeerChannelEncryptor { panic!("Requested act at wrong step"); } - let (re, temp_k2) = try!(PeerChannelEncryptor::inbound_noise_act(&self.secp_ctx, bidirectional_state, act_two, &ie)); + let (re, temp_k2) = PeerChannelEncryptor::inbound_noise_act(&self.secp_ctx, bidirectional_state, act_two, &ie)?; let mut res = [0; 66]; let our_node_id = PublicKey::from_secret_key(&self.secp_ctx, &our_node_secret).unwrap(); //TODO: nicer rng-is-bad error message @@ -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 }, @@ -355,14 +349,14 @@ impl PeerChannelEncryptor { panic!("Requested act at wrong step"); } if act_three[0] != 0 { - return Err(HandleError{err: "Unknown handshake version number", msg: Some(msgs::ErrorMessage::DisconnectPeer{})}); + return Err(HandleError{err: "Unknown handshake version number", action: Some(msgs::ErrorAction::DisconnectPeer{ msg: None })}); } let mut their_node_id = [0; 33]; - try!(PeerChannelEncryptor::decrypt_with_ad(&mut their_node_id, 1, &temp_k2.unwrap(), &bidirectional_state.h, &act_three[1..50])); + PeerChannelEncryptor::decrypt_with_ad(&mut their_node_id, 1, &temp_k2.unwrap(), &bidirectional_state.h, &act_three[1..50])?; self.their_node_id = Some(match PublicKey::from_slice(&self.secp_ctx, &their_node_id) { Ok(key) => key, - Err(_) => return Err(HandleError{err: "Bad node_id from peer", msg: Some(msgs::ErrorMessage::DisconnectPeer{})}), + Err(_) => return Err(HandleError{err: "Bad node_id from peer", action: Some(msgs::ErrorAction::DisconnectPeer{ msg: None })}), }); let mut sha = Sha256::new(); @@ -373,12 +367,11 @@ impl PeerChannelEncryptor { let ss = SharedSecret::new(&self.secp_ctx, &self.their_node_id.unwrap(), &re.unwrap()); let temp_k = PeerChannelEncryptor::hkdf(bidirectional_state, ss); - try!(PeerChannelEncryptor::decrypt_with_ad(&mut [0; 0], 0, &temp_k, &bidirectional_state.h, &act_three[50..])); + 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..]); @@ -459,7 +450,7 @@ impl PeerChannelEncryptor { } let mut res = [0; 2]; - try!(Self::decrypt_with_ad(&mut res, *rn, rk, &[0; 0], msg)); + Self::decrypt_with_ad(&mut res, *rn, rk, &[0; 0], msg)?; *rn += 1; Ok(byte_utils::slice_to_be16(&res)) }, @@ -478,7 +469,7 @@ impl PeerChannelEncryptor { NoiseState::Finished { sk: _, sn: _, sck: _, ref rk, ref mut rn, rck: _ } => { let mut res = Vec::with_capacity(msg.len() - 16); res.resize(msg.len() - 16, 0); - try!(Self::decrypt_with_ad(&mut res[..], *rn, rk, &[0; 0], msg)); + Self::decrypt_with_ad(&mut res[..], *rn, rk, &[0; 0], msg)?; *rn += 1; Ok(res) @@ -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[..]);