mirror of
https://github.com/lightningdevkit/rust-lightning.git
synced 2025-02-23 14:50:45 +01:00
rustfmt: Run on lightning/src/blinded_path/utils.rs
This commit is contained in:
Elias Rohrer
parent
47a1a8dbc9
commit
40f5524421
1 changed files with 92 additions and 64 deletions
|
|
@ -9,18 +9,18 @@
|
|||
|
||||
//! Onion message utility methods live here.
|
||||
|
||||
use bitcoin::hashes::{Hash, HashEngine};
|
||||
use bitcoin::hashes::hmac::{Hmac, HmacEngine};
|
||||
use bitcoin::hashes::sha256::Hash as Sha256;
|
||||
use bitcoin::secp256k1::{self, PublicKey, Secp256k1, SecretKey, Scalar};
|
||||
use bitcoin::hashes::{Hash, HashEngine};
|
||||
use bitcoin::secp256k1::ecdh::SharedSecret;
|
||||
use bitcoin::secp256k1::{self, PublicKey, Scalar, Secp256k1, SecretKey};
|
||||
|
||||
use super::{BlindedHop, BlindedPath};
|
||||
use super::message::BlindedMessagePath;
|
||||
use super::{BlindedHop, BlindedPath};
|
||||
use crate::crypto::streams::ChaChaPolyWriteAdapter;
|
||||
use crate::ln::msgs::DecodeError;
|
||||
use crate::ln::onion_utils;
|
||||
use crate::onion_message::messenger::Destination;
|
||||
use crate::crypto::streams::ChaChaPolyWriteAdapter;
|
||||
use crate::util::ser::{Readable, Writeable};
|
||||
|
||||
use crate::io;
|
||||
|
|
@ -32,60 +32,80 @@ use crate::prelude::*;
|
|||
|
||||
// TODO: DRY with onion_utils::construct_onion_keys_callback
|
||||
macro_rules! build_keys_helper {
|
||||
($session_priv: ident, $secp_ctx: ident, $callback: ident) =>
|
||||
{
|
||||
let mut msg_blinding_point_priv = $session_priv.clone();
|
||||
let mut msg_blinding_point = PublicKey::from_secret_key($secp_ctx, &msg_blinding_point_priv);
|
||||
let mut onion_packet_pubkey_priv = msg_blinding_point_priv.clone();
|
||||
let mut onion_packet_pubkey = msg_blinding_point.clone();
|
||||
($session_priv: ident, $secp_ctx: ident, $callback: ident) => {
|
||||
let mut msg_blinding_point_priv = $session_priv.clone();
|
||||
let mut msg_blinding_point =
|
||||
PublicKey::from_secret_key($secp_ctx, &msg_blinding_point_priv);
|
||||
let mut onion_packet_pubkey_priv = msg_blinding_point_priv.clone();
|
||||
let mut onion_packet_pubkey = msg_blinding_point.clone();
|
||||
|
||||
macro_rules! build_keys {
|
||||
($hop: expr, $blinded: expr, $encrypted_payload: expr) => {{
|
||||
let pk = *$hop.borrow();
|
||||
let encrypted_data_ss = SharedSecret::new(&pk, &msg_blinding_point_priv);
|
||||
macro_rules! build_keys {
|
||||
($hop: expr, $blinded: expr, $encrypted_payload: expr) => {{
|
||||
let pk = *$hop.borrow();
|
||||
let encrypted_data_ss = SharedSecret::new(&pk, &msg_blinding_point_priv);
|
||||
|
||||
let blinded_hop_pk = if $blinded { pk } else {
|
||||
let hop_pk_blinding_factor = {
|
||||
let mut hmac = HmacEngine::<Sha256>::new(b"blinded_node_id");
|
||||
hmac.input(encrypted_data_ss.as_ref());
|
||||
Hmac::from_engine(hmac).to_byte_array()
|
||||
let blinded_hop_pk = if $blinded {
|
||||
pk
|
||||
} else {
|
||||
let hop_pk_blinding_factor = {
|
||||
let mut hmac = HmacEngine::<Sha256>::new(b"blinded_node_id");
|
||||
hmac.input(encrypted_data_ss.as_ref());
|
||||
Hmac::from_engine(hmac).to_byte_array()
|
||||
};
|
||||
pk.mul_tweak(
|
||||
$secp_ctx,
|
||||
&Scalar::from_be_bytes(hop_pk_blinding_factor).unwrap(),
|
||||
)?
|
||||
};
|
||||
pk.mul_tweak($secp_ctx, &Scalar::from_be_bytes(hop_pk_blinding_factor).unwrap())?
|
||||
let onion_packet_ss = SharedSecret::new(&blinded_hop_pk, &onion_packet_pubkey_priv);
|
||||
|
||||
let rho = onion_utils::gen_rho_from_shared_secret(encrypted_data_ss.as_ref());
|
||||
let unblinded_hop_opt = if $blinded { None } else { Some($hop) };
|
||||
$callback(
|
||||
blinded_hop_pk,
|
||||
onion_packet_ss,
|
||||
onion_packet_pubkey,
|
||||
rho,
|
||||
unblinded_hop_opt,
|
||||
$encrypted_payload,
|
||||
);
|
||||
(encrypted_data_ss, onion_packet_ss)
|
||||
}};
|
||||
}
|
||||
|
||||
macro_rules! build_keys_in_loop {
|
||||
($pk: expr, $blinded: expr, $encrypted_payload: expr) => {
|
||||
let (encrypted_data_ss, onion_packet_ss) =
|
||||
build_keys!($pk, $blinded, $encrypted_payload);
|
||||
|
||||
let msg_blinding_point_blinding_factor = {
|
||||
let mut sha = Sha256::engine();
|
||||
sha.input(&msg_blinding_point.serialize()[..]);
|
||||
sha.input(encrypted_data_ss.as_ref());
|
||||
Sha256::from_engine(sha).to_byte_array()
|
||||
};
|
||||
|
||||
msg_blinding_point_priv = msg_blinding_point_priv.mul_tweak(
|
||||
&Scalar::from_be_bytes(msg_blinding_point_blinding_factor).unwrap(),
|
||||
)?;
|
||||
msg_blinding_point =
|
||||
PublicKey::from_secret_key($secp_ctx, &msg_blinding_point_priv);
|
||||
|
||||
let onion_packet_pubkey_blinding_factor = {
|
||||
let mut sha = Sha256::engine();
|
||||
sha.input(&onion_packet_pubkey.serialize()[..]);
|
||||
sha.input(onion_packet_ss.as_ref());
|
||||
Sha256::from_engine(sha).to_byte_array()
|
||||
};
|
||||
onion_packet_pubkey_priv = onion_packet_pubkey_priv.mul_tweak(
|
||||
&Scalar::from_be_bytes(onion_packet_pubkey_blinding_factor).unwrap(),
|
||||
)?;
|
||||
onion_packet_pubkey =
|
||||
PublicKey::from_secret_key($secp_ctx, &onion_packet_pubkey_priv);
|
||||
};
|
||||
let onion_packet_ss = SharedSecret::new(&blinded_hop_pk, &onion_packet_pubkey_priv);
|
||||
|
||||
let rho = onion_utils::gen_rho_from_shared_secret(encrypted_data_ss.as_ref());
|
||||
let unblinded_hop_opt = if $blinded { None } else { Some($hop) };
|
||||
$callback(blinded_hop_pk, onion_packet_ss, onion_packet_pubkey, rho, unblinded_hop_opt, $encrypted_payload);
|
||||
(encrypted_data_ss, onion_packet_ss)
|
||||
}}
|
||||
}
|
||||
|
||||
macro_rules! build_keys_in_loop {
|
||||
($pk: expr, $blinded: expr, $encrypted_payload: expr) => {
|
||||
let (encrypted_data_ss, onion_packet_ss) = build_keys!($pk, $blinded, $encrypted_payload);
|
||||
|
||||
let msg_blinding_point_blinding_factor = {
|
||||
let mut sha = Sha256::engine();
|
||||
sha.input(&msg_blinding_point.serialize()[..]);
|
||||
sha.input(encrypted_data_ss.as_ref());
|
||||
Sha256::from_engine(sha).to_byte_array()
|
||||
};
|
||||
|
||||
msg_blinding_point_priv = msg_blinding_point_priv.mul_tweak(&Scalar::from_be_bytes(msg_blinding_point_blinding_factor).unwrap())?;
|
||||
msg_blinding_point = PublicKey::from_secret_key($secp_ctx, &msg_blinding_point_priv);
|
||||
|
||||
let onion_packet_pubkey_blinding_factor = {
|
||||
let mut sha = Sha256::engine();
|
||||
sha.input(&onion_packet_pubkey.serialize()[..]);
|
||||
sha.input(onion_packet_ss.as_ref());
|
||||
Sha256::from_engine(sha).to_byte_array()
|
||||
};
|
||||
onion_packet_pubkey_priv = onion_packet_pubkey_priv.mul_tweak(&Scalar::from_be_bytes(onion_packet_pubkey_blinding_factor).unwrap())?;
|
||||
onion_packet_pubkey = PublicKey::from_secret_key($secp_ctx, &onion_packet_pubkey_priv);
|
||||
};
|
||||
}
|
||||
}}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub(crate) fn construct_keys_for_onion_message<'a, T, I, F>(
|
||||
|
|
@ -94,7 +114,7 @@ pub(crate) fn construct_keys_for_onion_message<'a, T, I, F>(
|
|||
) -> Result<(), secp256k1::Error>
|
||||
where
|
||||
T: secp256k1::Signing + secp256k1::Verification,
|
||||
I: Iterator<Item=PublicKey>,
|
||||
I: Iterator<Item = PublicKey>,
|
||||
F: FnMut(PublicKey, SharedSecret, PublicKey, [u8; 32], Option<PublicKey>, Option<Vec<u8>>),
|
||||
{
|
||||
build_keys_helper!(session_priv, secp_ctx, callback);
|
||||
|
|
@ -122,7 +142,7 @@ pub(super) fn construct_keys_for_blinded_path<'a, T, I, F, H>(
|
|||
where
|
||||
T: secp256k1::Signing + secp256k1::Verification,
|
||||
H: Borrow<PublicKey>,
|
||||
I: Iterator<Item=H>,
|
||||
I: Iterator<Item = H>,
|
||||
F: FnMut(PublicKey, SharedSecret, PublicKey, [u8; 32], Option<H>, Option<Vec<u8>>),
|
||||
{
|
||||
build_keys_helper!(session_priv, secp_ctx, callback);
|
||||
|
|
@ -134,8 +154,8 @@ where
|
|||
}
|
||||
|
||||
struct PublicKeyWithTlvs<W: Writeable> {
|
||||
pubkey: PublicKey,
|
||||
tlvs: W,
|
||||
pubkey: PublicKey,
|
||||
tlvs: W,
|
||||
}
|
||||
|
||||
impl<W: Writeable> Borrow<PublicKey> for PublicKeyWithTlvs<W> {
|
||||
|
|
@ -149,18 +169,24 @@ pub(crate) fn construct_blinded_hops<'a, T, I, W>(
|
|||
) -> Result<Vec<BlindedHop>, secp256k1::Error>
|
||||
where
|
||||
T: secp256k1::Signing + secp256k1::Verification,
|
||||
I: Iterator<Item=(PublicKey, W)>,
|
||||
W: Writeable
|
||||
I: Iterator<Item = (PublicKey, W)>,
|
||||
W: Writeable,
|
||||
{
|
||||
let mut blinded_hops = Vec::with_capacity(unblinded_path.size_hint().0);
|
||||
construct_keys_for_blinded_path(
|
||||
secp_ctx, unblinded_path.map(|(pubkey, tlvs)| PublicKeyWithTlvs { pubkey, tlvs }), session_priv,
|
||||
secp_ctx,
|
||||
unblinded_path.map(|(pubkey, tlvs)| PublicKeyWithTlvs { pubkey, tlvs }),
|
||||
session_priv,
|
||||
|blinded_node_id, _, _, encrypted_payload_rho, unblinded_hop_data, _| {
|
||||
blinded_hops.push(BlindedHop {
|
||||
blinded_node_id,
|
||||
encrypted_payload: encrypt_payload(unblinded_hop_data.unwrap().tlvs, encrypted_payload_rho),
|
||||
encrypted_payload: encrypt_payload(
|
||||
unblinded_hop_data.unwrap().tlvs,
|
||||
encrypted_payload_rho,
|
||||
),
|
||||
});
|
||||
})?;
|
||||
},
|
||||
)?;
|
||||
Ok(blinded_hops)
|
||||
}
|
||||
|
||||
|
|
@ -179,7 +205,9 @@ impl Readable for Padding {
|
|||
fn read<R: io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
|
||||
loop {
|
||||
let mut buf = [0; 8192];
|
||||
if reader.read(&mut buf[..])? == 0 { break; }
|
||||
if reader.read(&mut buf[..])? == 0 {
|
||||
break;
|
||||
}
|
||||
}
|
||||
Ok(Self {})
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue