projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
impl a bunch of additional messages, remove some useless mut
[rust-lightning]
/
src
/
ln
/
channel.rs
diff --git
a/src/ln/channel.rs
b/src/ln/channel.rs
index ef73db8eb813b2dea164cc00a4b245924c1898a1..59a5797bfd5e192d5e3c72ac81e5f82d7e59a96c 100644
(file)
--- a/
src/ln/channel.rs
+++ b/
src/ln/channel.rs
@@
-43,34
+43,33
@@
pub struct ChannelKeys {
impl ChannelKeys {
pub fn new_from_seed(seed: &[u8; 32]) -> Result<ChannelKeys, secp256k1::Error> {
impl ChannelKeys {
pub fn new_from_seed(seed: &[u8; 32]) -> Result<ChannelKeys, secp256k1::Error> {
- let sha = Sha256::new();
let mut prk = [0; 32];
let mut prk = [0; 32];
- hkdf_extract(
sha
, b"rust-lightning key gen salt", seed, &mut prk);
+ hkdf_extract(
Sha256::new()
, b"rust-lightning key gen salt", seed, &mut prk);
let secp_ctx = Secp256k1::new();
let mut okm = [0; 32];
let secp_ctx = Secp256k1::new();
let mut okm = [0; 32];
- hkdf_expand(
sha
, &prk, b"rust-lightning funding key info", &mut okm);
+ hkdf_expand(
Sha256::new()
, &prk, b"rust-lightning funding key info", &mut okm);
let funding_key = SecretKey::from_slice(&secp_ctx, &okm)?;
let funding_key = SecretKey::from_slice(&secp_ctx, &okm)?;
- hkdf_expand(
sha
, &prk, b"rust-lightning revocation base key info", &mut okm);
+ hkdf_expand(
Sha256::new()
, &prk, b"rust-lightning revocation base key info", &mut okm);
let revocation_base_key = SecretKey::from_slice(&secp_ctx, &okm)?;
let revocation_base_key = SecretKey::from_slice(&secp_ctx, &okm)?;
- hkdf_expand(
sha
, &prk, b"rust-lightning payment base key info", &mut okm);
+ hkdf_expand(
Sha256::new()
, &prk, b"rust-lightning payment base key info", &mut okm);
let payment_base_key = SecretKey::from_slice(&secp_ctx, &okm)?;
let payment_base_key = SecretKey::from_slice(&secp_ctx, &okm)?;
- hkdf_expand(
sha
, &prk, b"rust-lightning delayed payment base key info", &mut okm);
+ hkdf_expand(
Sha256::new()
, &prk, b"rust-lightning delayed payment base key info", &mut okm);
let delayed_payment_base_key = SecretKey::from_slice(&secp_ctx, &okm)?;
let delayed_payment_base_key = SecretKey::from_slice(&secp_ctx, &okm)?;
- hkdf_expand(
sha
, &prk, b"rust-lightning htlc base key info", &mut okm);
+ hkdf_expand(
Sha256::new()
, &prk, b"rust-lightning htlc base key info", &mut okm);
let htlc_base_key = SecretKey::from_slice(&secp_ctx, &okm)?;
let htlc_base_key = SecretKey::from_slice(&secp_ctx, &okm)?;
- hkdf_expand(
sha
, &prk, b"rust-lightning channel close key info", &mut okm);
+ hkdf_expand(
Sha256::new()
, &prk, b"rust-lightning channel close key info", &mut okm);
let channel_close_key = SecretKey::from_slice(&secp_ctx, &okm)?;
let channel_close_key = SecretKey::from_slice(&secp_ctx, &okm)?;
- hkdf_expand(
sha
, &prk, b"rust-lightning channel monitor claim key info", &mut okm);
+ hkdf_expand(
Sha256::new()
, &prk, b"rust-lightning channel monitor claim key info", &mut okm);
let channel_monitor_claim_key = SecretKey::from_slice(&secp_ctx, &okm)?;
let channel_monitor_claim_key = SecretKey::from_slice(&secp_ctx, &okm)?;
- hkdf_expand(
sha
, &prk, b"rust-lightning local commitment seed info", &mut okm);
+ hkdf_expand(
Sha256::new()
, &prk, b"rust-lightning local commitment seed info", &mut okm);
Ok(ChannelKeys {
funding_key: funding_key,
Ok(ChannelKeys {
funding_key: funding_key,