f - HMAC entire ReceiveTlvs

Author: jkczyz

lightning/src/ln/channelmanager.rs

@@ -477,17 +477,17 @@ impl Verification for PaymentHash {
 	}
 }
 
-impl Verification for PaymentContext {
+impl Verification for ReceiveTlvs {
 	fn hmac_for_offer_payment(
 		&self, nonce: Nonce, expanded_key: &inbound_payment::ExpandedKey,
 	) -> Hmac<Sha256> {
-		signer::hmac_for_payment_context(self, nonce, expanded_key)
+		signer::hmac_for_payment_tlvs(self, nonce, expanded_key)
 	}
 
 	fn verify_for_offer_payment(
 		&self, hmac: Hmac<Sha256>, nonce: Nonce, expanded_key: &inbound_payment::ExpandedKey,
 	) -> Result<(), ()> {
-		signer::verify_payment_context(self, hmac, nonce, expanded_key)
+		signer::verify_payment_tlvs(self, hmac, nonce, expanded_key)
 	}
 }
 

lightning/src/offers/signer.rs

@@ -16,7 +16,7 @@ use bitcoin::hashes::sha256::Hash as Sha256;
 use bitcoin::secp256k1::{Keypair, PublicKey, Secp256k1, SecretKey, self};
 use types::payment::PaymentHash;
 use core::fmt;
-use crate::blinded_path::payment::PaymentContext;
+use crate::blinded_path::payment::ReceiveTlvs;
 use crate::ln::channelmanager::PaymentId;
 use crate::ln::inbound_payment::{ExpandedKey, IV_LEN};
 use crate::offers::merkle::TlvRecord;
@@ -47,8 +47,8 @@ const ASYNC_PAYMENT_ID_HMAC_INPUT: &[u8; 16] = &[6; 16];
 // HMAC input for a `PaymentHash`. The HMAC is used in `OffersContext::InboundPayment`.
 const PAYMENT_HASH_HMAC_INPUT: &[u8; 16] = &[7; 16];
 
-// HMAC input for a `PaymentContext`. The HMAC is used in `blinded_path::payment::ReceiveTlvs`.
-const PAYMENT_CONTEXT_HMAC_INPUT: &[u8; 16] = &[8; 16];
+// HMAC input for `ReceiveTlvs`. The HMAC is used in `blinded_path::payment::PaymentContext`.
+const PAYMENT_TLVS_HMAC_INPUT: &[u8; 16] = &[8; 16];
 
 /// Message metadata which possibly is derived from [`MetadataMaterial`] such that it can be
 /// verified.
@@ -464,21 +464,21 @@ fn hmac_for_payment_id(
 	Hmac::from_engine(hmac)
 }
 
-pub(crate) fn hmac_for_payment_context(
-	payment_context: &PaymentContext, nonce: Nonce, expanded_key: &ExpandedKey,
+pub(crate) fn hmac_for_payment_tlvs(
+	receive_tlvs: &ReceiveTlvs, nonce: Nonce, expanded_key: &ExpandedKey,
 ) -> Hmac<Sha256> {
-	const IV_BYTES: &[u8; IV_LEN] = b"LDK Payment ~~~~";
+	const IV_BYTES: &[u8; IV_LEN] = b"LDK Payment TLVs";
 	let mut hmac = expanded_key.hmac_for_offer();
 	hmac.input(IV_BYTES);
 	hmac.input(&nonce.0);
-	hmac.input(PAYMENT_CONTEXT_HMAC_INPUT);
-	payment_context.write(&mut hmac).unwrap();
+	hmac.input(PAYMENT_TLVS_HMAC_INPUT);
+	receive_tlvs.write(&mut hmac).unwrap();
 
 	Hmac::from_engine(hmac)
 }
 
-pub(crate) fn verify_payment_context(
-	payment_context: &PaymentContext, hmac: Hmac<Sha256>, nonce: Nonce, expanded_key: &ExpandedKey,
+pub(crate) fn verify_payment_tlvs(
+	receive_tlvs: &ReceiveTlvs, hmac: Hmac<Sha256>, nonce: Nonce, expanded_key: &ExpandedKey,
 ) -> Result<(), ()> {
-	if hmac_for_payment_context(payment_context, nonce, expanded_key) == hmac { Ok(()) } else { Err(()) }
+	if hmac_for_payment_tlvs(receive_tlvs, nonce, expanded_key) == hmac { Ok(()) } else { Err(()) }
 }