use ln::msgs::HandleError;
use ln::msgs;
+use bitcoin_hashes::{Hash, HashEngine, Hmac, HmacEngine};
+use bitcoin_hashes::sha256::Hash as Sha256;
+
use secp256k1::Secp256k1;
use secp256k1::key::{PublicKey,SecretKey};
use secp256k1::ecdh::SharedSecret;
use secp256k1;
-use crypto::digest::Digest;
-use crypto::hkdf::{hkdf_extract,hkdf_expand};
-
-use crypto::aead::{AeadEncryptor, AeadDecryptor};
-
use util::chacha20poly1305rfc::ChaCha20Poly1305RFC;
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];
rng::fill_bytes(&mut key);
let secp_ctx = Secp256k1::signing_only();
- let sec_key = SecretKey::from_slice(&secp_ctx, &key).unwrap(); //TODO: nicer rng-is-bad error message
+ let sec_key = SecretKey::from_slice(&key).unwrap(); //TODO: nicer rng-is-bad error message
- let mut sha = Sha256::new();
+ let mut sha = Sha256::engine();
sha.input(&NOISE_H);
sha.input(&their_node_id.serialize()[..]);
- let mut h = [0; 32];
- sha.result(&mut h);
+ let h = Sha256::from_engine(sha).into_inner();
PeerChannelEncryptor {
their_node_id: Some(their_node_id),
pub fn new_inbound(our_node_secret: &SecretKey) -> PeerChannelEncryptor {
let secp_ctx = Secp256k1::signing_only();
- let mut sha = Sha256::new();
+ let mut sha = Sha256::engine();
sha.input(&NOISE_H);
let our_node_id = PublicKey::from_secret_key(&secp_ctx, our_node_secret);
sha.input(&our_node_id.serialize()[..]);
- let mut h = [0; 32];
- sha.result(&mut h);
+ let h = Sha256::from_engine(sha).into_inner();
PeerChannelEncryptor {
their_node_id: None,
Ok(())
}
+ fn hkdf_extract_expand(salt: &[u8], ikm: &[u8]) -> ([u8; 32], [u8; 32]) {
+ let mut hmac = HmacEngine::<Sha256>::new(salt);
+ hmac.input(ikm);
+ let prk = Hmac::from_engine(hmac).into_inner();
+ let mut hmac = HmacEngine::<Sha256>::new(&prk[..]);
+ hmac.input(&[1; 1]);
+ let t1 = Hmac::from_engine(hmac).into_inner();
+ let mut hmac = HmacEngine::<Sha256>::new(&prk[..]);
+ hmac.input(&t1);
+ hmac.input(&[2; 1]);
+ (t1, Hmac::from_engine(hmac).into_inner())
+ }
+
#[inline]
fn hkdf(state: &mut BidirectionalNoiseState, ss: SharedSecret) -> [u8; 32] {
- let mut hkdf = [0; 64];
- {
- let mut prk = [0; 32];
- 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];
- res.copy_from_slice(&hkdf[32..]);
- res
+ let (t1, t2) = Self::hkdf_extract_expand(&state.ck, &ss[..]);
+ state.ck = t1;
+ t2
}
#[inline]
fn outbound_noise_act<T: secp256k1::Signing>(secp_ctx: &Secp256k1<T>, state: &mut BidirectionalNoiseState, our_key: &SecretKey, their_key: &PublicKey) -> ([u8; 50], [u8; 32]) {
let our_pub = PublicKey::from_secret_key(secp_ctx, &our_key);
- let mut sha = Sha256::new();
+ let mut sha = Sha256::engine();
sha.input(&state.h);
sha.input(&our_pub.serialize()[..]);
- sha.result(&mut state.h);
+ state.h = Sha256::from_engine(sha).into_inner();
- let ss = SharedSecret::new(secp_ctx, &their_key, &our_key);
+ let ss = SharedSecret::new(&their_key, &our_key);
let temp_k = PeerChannelEncryptor::hkdf(state, ss);
let mut res = [0; 50];
res[1..34].copy_from_slice(&our_pub.serialize()[..]);
PeerChannelEncryptor::encrypt_with_ad(&mut res[34..], 0, &temp_k, &state.h, &[0; 0]);
- sha.reset();
+ let mut sha = Sha256::engine();
sha.input(&state.h);
sha.input(&res[34..]);
- sha.result(&mut state.h);
+ state.h = Sha256::from_engine(sha).into_inner();
(res, temp_k)
}
#[inline]
- fn inbound_noise_act<T>(secp_ctx: &Secp256k1<T>, state: &mut BidirectionalNoiseState, act: &[u8], our_key: &SecretKey) -> Result<(PublicKey, [u8; 32]), HandleError> {
+ fn inbound_noise_act(state: &mut BidirectionalNoiseState, act: &[u8], our_key: &SecretKey) -> Result<(PublicKey, [u8; 32]), HandleError> {
assert_eq!(act.len(), 50);
if act[0] != 0 {
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]) {
+ let their_pub = match PublicKey::from_slice(&act[1..34]) {
Err(_) => return Err(HandleError{err: "Invalid public key", action: Some(msgs::ErrorAction::DisconnectPeer{ msg: None })}),
Ok(key) => key,
};
- let mut sha = Sha256::new();
+ let mut sha = Sha256::engine();
sha.input(&state.h);
sha.input(&their_pub.serialize()[..]);
- sha.result(&mut state.h);
+ state.h = Sha256::from_engine(sha).into_inner();
- let ss = SharedSecret::new(secp_ctx, &their_pub, &our_key);
+ let ss = SharedSecret::new(&their_pub, &our_key);
let temp_k = PeerChannelEncryptor::hkdf(state, ss);
let mut dec = [0; 0];
PeerChannelEncryptor::decrypt_with_ad(&mut dec, 0, &temp_k, &state.h, &act[34..])?;
- sha.reset();
+ let mut sha = Sha256::engine();
sha.input(&state.h);
sha.input(&act[34..]);
- sha.result(&mut state.h);
+ state.h = Sha256::from_engine(sha).into_inner();
Ok((their_pub, temp_k))
}
panic!("Requested act at wrong step");
}
- let (their_pub, _) = PeerChannelEncryptor::inbound_noise_act(&self.secp_ctx, bidirectional_state, act_one, &our_node_secret)?;
+ let (their_pub, _) = PeerChannelEncryptor::inbound_noise_act(bidirectional_state, act_one, &our_node_secret)?;
ie.get_or_insert(their_pub);
re.get_or_insert(our_ephemeral);
let mut key = [0u8; 32];
rng::fill_bytes(&mut key);
- let our_ephemeral_key = SecretKey::from_slice(&self.secp_ctx, &key).unwrap(); //TODO: nicer rng-is-bad error message
+ let our_ephemeral_key = SecretKey::from_slice(&key).unwrap(); //TODO: nicer rng-is-bad error message
self.process_act_one_with_ephemeral_key(act_one, our_node_secret, our_ephemeral_key)
}
pub fn process_act_two(&mut self, act_two: &[u8], our_node_secret: &SecretKey) -> Result<([u8; 66], PublicKey), HandleError> {
assert_eq!(act_two.len(), 50);
- let mut final_hkdf = [0; 64];
+ let final_hkdf;
let ck;
let res: [u8; 66] = match self.noise_state {
NoiseState::InProgress { ref state, ref directional_state, ref mut bidirectional_state } =>
panic!("Requested act at wrong step");
}
- let (re, temp_k2) = PeerChannelEncryptor::inbound_noise_act(&self.secp_ctx, bidirectional_state, act_two, &ie)?;
+ let (re, temp_k2) = PeerChannelEncryptor::inbound_noise_act(bidirectional_state, act_two, &ie)?;
let mut res = [0; 66];
let our_node_id = PublicKey::from_secret_key(&self.secp_ctx, &our_node_secret);
PeerChannelEncryptor::encrypt_with_ad(&mut res[1..50], 1, &temp_k2, &bidirectional_state.h, &our_node_id.serialize()[..]);
- let mut sha = Sha256::new();
+ let mut sha = Sha256::engine();
sha.input(&bidirectional_state.h);
sha.input(&res[1..50]);
- sha.result(&mut bidirectional_state.h);
+ bidirectional_state.h = Sha256::from_engine(sha).into_inner();
- let ss = SharedSecret::new(&self.secp_ctx, &re, our_node_secret);
+ let ss = SharedSecret::new(&re, our_node_secret);
let temp_k = PeerChannelEncryptor::hkdf(bidirectional_state, ss);
PeerChannelEncryptor::encrypt_with_ad(&mut res[50..], 0, &temp_k, &bidirectional_state.h, &[0; 0]);
-
- let mut prk = [0; 32];
- hkdf_extract(Sha256::new(), &bidirectional_state.ck, &[0; 0], &mut prk);
- hkdf_expand(Sha256::new(), &prk, &[0;0], &mut final_hkdf);
+ final_hkdf = Self::hkdf_extract_expand(&bidirectional_state.ck, &[0; 0]);
ck = bidirectional_state.ck.clone();
res
},
_ => panic!("Cannot get act one after noise handshake completes"),
};
- let mut sk = [0; 32];
- let mut rk = [0; 32];
- sk.copy_from_slice(&final_hkdf[0..32]);
- rk.copy_from_slice(&final_hkdf[32..]);
-
+ let (sk, rk) = final_hkdf;
self.noise_state = NoiseState::Finished {
sk: sk,
sn: 0,
pub fn process_act_three(&mut self, act_three: &[u8]) -> Result<PublicKey, HandleError> {
assert_eq!(act_three.len(), 66);
- let mut final_hkdf = [0; 64];
+ let final_hkdf;
let ck;
match self.noise_state {
NoiseState::InProgress { ref state, ref directional_state, ref mut bidirectional_state } =>
let mut their_node_id = [0; 33];
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) {
+ self.their_node_id = Some(match PublicKey::from_slice(&their_node_id) {
Ok(key) => key,
Err(_) => return Err(HandleError{err: "Bad node_id from peer", action: Some(msgs::ErrorAction::DisconnectPeer{ msg: None })}),
});
- let mut sha = Sha256::new();
+ let mut sha = Sha256::engine();
sha.input(&bidirectional_state.h);
sha.input(&act_three[1..50]);
- sha.result(&mut bidirectional_state.h);
+ bidirectional_state.h = Sha256::from_engine(sha).into_inner();
- let ss = SharedSecret::new(&self.secp_ctx, &self.their_node_id.unwrap(), &re.unwrap());
+ let ss = SharedSecret::new(&self.their_node_id.unwrap(), &re.unwrap());
let temp_k = PeerChannelEncryptor::hkdf(bidirectional_state, ss);
PeerChannelEncryptor::decrypt_with_ad(&mut [0; 0], 0, &temp_k, &bidirectional_state.h, &act_three[50..])?;
-
- let mut prk = [0; 32];
- hkdf_extract(Sha256::new(), &bidirectional_state.ck, &[0; 0], &mut prk);
- hkdf_expand(Sha256::new(), &prk, &[0;0], &mut final_hkdf);
+ final_hkdf = Self::hkdf_extract_expand(&bidirectional_state.ck, &[0; 0]);
ck = bidirectional_state.ck.clone();
},
_ => panic!("Wrong direction for act"),
_ => panic!("Cannot get act one after noise handshake completes"),
}
- let mut rk = [0; 32];
- let mut sk = [0; 32];
- rk.copy_from_slice(&final_hkdf[0..32]);
- sk.copy_from_slice(&final_hkdf[32..]);
-
+ let (rk, sk) = final_hkdf;
self.noise_state = NoiseState::Finished {
sk: sk,
sn: 0,
match self.noise_state {
NoiseState::Finished { ref mut sk, ref mut sn, ref mut sck, rk: _, rn: _, rck: _ } => {
if *sn >= 1000 {
- let mut prk = [0; 32];
- hkdf_extract(Sha256::new(), sck, sk, &mut prk);
- let mut hkdf = [0; 64];
- hkdf_expand(Sha256::new(), &prk, &[0;0], &mut hkdf);
-
- sck[..].copy_from_slice(&hkdf[0..32]);
- sk[..].copy_from_slice(&hkdf[32..]);
+ let (new_sck, new_sk) = Self::hkdf_extract_expand(sck, sk);
+ *sck = new_sck;
+ *sk = new_sk;
*sn = 0;
}
match self.noise_state {
NoiseState::Finished { sk: _, sn: _, sck: _, ref mut rk, ref mut rn, ref mut rck } => {
if *rn >= 1000 {
- let mut prk = [0; 32];
- hkdf_extract(Sha256::new(), rck, rk, &mut prk);
- let mut hkdf = [0; 64];
- hkdf_expand(Sha256::new(), &prk, &[0;0], &mut hkdf);
-
- rck[..].copy_from_slice(&hkdf[0..32]);
- rk[..].copy_from_slice(&hkdf[32..]);
+ let (new_rck, new_rk) = Self::hkdf_extract_expand(rck, rk);
+ *rck = new_rck;
+ *rk = new_rk;
*rn = 0;
}
#[cfg(test)]
mod tests {
- use secp256k1::Secp256k1;
use secp256k1::key::{PublicKey,SecretKey};
use hex;
use ln::peer_channel_encryptor::{PeerChannelEncryptor,NoiseState,DirectionalNoiseState};
fn get_outbound_peer_for_initiator_test_vectors() -> PeerChannelEncryptor {
- let secp_ctx = Secp256k1::new();
- let their_node_id = PublicKey::from_slice(&secp_ctx, &hex::decode("028d7500dd4c12685d1f568b4c2b5048e8534b873319f3a8daa612b469132ec7f7").unwrap()[..]).unwrap();
+ let their_node_id = PublicKey::from_slice(&hex::decode("028d7500dd4c12685d1f568b4c2b5048e8534b873319f3a8daa612b469132ec7f7").unwrap()[..]).unwrap();
let mut outbound_peer = PeerChannelEncryptor::new_outbound(their_node_id);
match outbound_peer.noise_state {
NoiseState::InProgress { state: _, ref mut directional_state, bidirectional_state: _ } => {
*directional_state = DirectionalNoiseState::Outbound { // overwrite ie...
- ie: SecretKey::from_slice(&secp_ctx, &hex::decode("1212121212121212121212121212121212121212121212121212121212121212").unwrap()[..]).unwrap(),
+ ie: SecretKey::from_slice(&hex::decode("1212121212121212121212121212121212121212121212121212121212121212").unwrap()[..]).unwrap(),
};
},
_ => panic!()
#[test]
fn noise_initiator_test_vectors() {
- let secp_ctx = Secp256k1::new();
- let our_node_id = SecretKey::from_slice(&secp_ctx, &hex::decode("1111111111111111111111111111111111111111111111111111111111111111").unwrap()[..]).unwrap();
+ let our_node_id = SecretKey::from_slice(&hex::decode("1111111111111111111111111111111111111111111111111111111111111111").unwrap()[..]).unwrap();
{
// transport-initiator successful handshake
#[test]
fn noise_responder_test_vectors() {
- let secp_ctx = Secp256k1::new();
- let our_node_id = SecretKey::from_slice(&secp_ctx, &hex::decode("2121212121212121212121212121212121212121212121212121212121212121").unwrap()[..]).unwrap();
- let our_ephemeral = SecretKey::from_slice(&secp_ctx, &hex::decode("2222222222222222222222222222222222222222222222222222222222222222").unwrap()[..]).unwrap();
+ let our_node_id = SecretKey::from_slice(&hex::decode("2121212121212121212121212121212121212121212121212121212121212121").unwrap()[..]).unwrap();
+ let our_ephemeral = SecretKey::from_slice(&hex::decode("2222222222222222222222222222222222222222222222222222222222222222").unwrap()[..]).unwrap();
{
// transport-responder successful handshake
assert_eq!(inbound_peer.process_act_one_with_ephemeral_key(&act_one[..], &our_node_id, our_ephemeral.clone()).unwrap()[..], hex::decode("0002466d7fcae563e5cb09a0d1870bb580344804617879a14949cf22285f1bae3f276e2470b93aac583c9ef6eafca3f730ae").unwrap()[..]);
let act_three = hex::decode("00b9e3a702e93e3a9948c2ed6e5fd7590a6e1c3a0344cfc9d5b57357049aa22355361aa02e55a8fc28fef5bd6d71ad0c38228dc68b1c466263b47fdf31e560e139ba").unwrap().to_vec();
- // test vector doesn't specify the initiator static key, but its the same as the one
- // from trasport-initiator successful handshake
+ // test vector doesn't specify the initiator static key, but it's the same as the one
+ // from transport-initiator successful handshake
assert_eq!(inbound_peer.process_act_three(&act_three[..]).unwrap().serialize()[..], hex::decode("034f355bdcb7cc0af728ef3cceb9615d90684bb5b2ca5f859ab0f0b704075871aa").unwrap()[..]);
match inbound_peer.noise_state {
#[test]
fn message_encryption_decryption_test_vectors() {
- let secp_ctx = Secp256k1::new();
-
// We use the same keys as the initiator and responder test vectors, so we copy those tests
// here and use them to encrypt.
let mut outbound_peer = get_outbound_peer_for_initiator_test_vectors();
{
- let our_node_id = SecretKey::from_slice(&secp_ctx, &hex::decode("1111111111111111111111111111111111111111111111111111111111111111").unwrap()[..]).unwrap();
+ let our_node_id = SecretKey::from_slice(&hex::decode("1111111111111111111111111111111111111111111111111111111111111111").unwrap()[..]).unwrap();
let act_two = hex::decode("0002466d7fcae563e5cb09a0d1870bb580344804617879a14949cf22285f1bae3f276e2470b93aac583c9ef6eafca3f730ae").unwrap().to_vec();
assert_eq!(outbound_peer.process_act_two(&act_two[..], &our_node_id).unwrap().0[..], hex::decode("00b9e3a702e93e3a9948c2ed6e5fd7590a6e1c3a0344cfc9d5b57357049aa22355361aa02e55a8fc28fef5bd6d71ad0c38228dc68b1c466263b47fdf31e560e139ba").unwrap()[..]);
{
// transport-responder successful handshake
- let our_node_id = SecretKey::from_slice(&secp_ctx, &hex::decode("2121212121212121212121212121212121212121212121212121212121212121").unwrap()[..]).unwrap();
- let our_ephemeral = SecretKey::from_slice(&secp_ctx, &hex::decode("2222222222222222222222222222222222222222222222222222222222222222").unwrap()[..]).unwrap();
+ let our_node_id = SecretKey::from_slice(&hex::decode("2121212121212121212121212121212121212121212121212121212121212121").unwrap()[..]).unwrap();
+ let our_ephemeral = SecretKey::from_slice(&hex::decode("2222222222222222222222222222222222222222222222222222222222222222").unwrap()[..]).unwrap();
inbound_peer = PeerChannelEncryptor::new_inbound(&our_node_id);
assert_eq!(inbound_peer.process_act_one_with_ephemeral_key(&act_one[..], &our_node_id, our_ephemeral.clone()).unwrap()[..], hex::decode("0002466d7fcae563e5cb09a0d1870bb580344804617879a14949cf22285f1bae3f276e2470b93aac583c9ef6eafca3f730ae").unwrap()[..]);
let act_three = hex::decode("00b9e3a702e93e3a9948c2ed6e5fd7590a6e1c3a0344cfc9d5b57357049aa22355361aa02e55a8fc28fef5bd6d71ad0c38228dc68b1c466263b47fdf31e560e139ba").unwrap().to_vec();
- // test vector doesn't specify the initiator static key, but its the same as the one
- // from trasport-initiator successful handshake
+ // test vector doesn't specify the initiator static key, but it's the same as the one
+ // from transport-initiator successful handshake
assert_eq!(inbound_peer.process_act_three(&act_three[..]).unwrap().serialize()[..], hex::decode("034f355bdcb7cc0af728ef3cceb9615d90684bb5b2ca5f859ab0f0b704075871aa").unwrap()[..]);
match inbound_peer.noise_state {
projects / rust-lightning / blobdiff