Use [u8; 32] rather than Hmac<Sha256> for simplicity

Mapping an `Hmac<Sha256>` would require somewhat custom logic as
we'd have to behave differently based on generic parameters, so its
simplest to just swap it to a `[u8; 32]` instead.

Author: TheBlueMatt

lightning/src/blinded_path/message.rs

@@ -344,7 +344,7 @@ pub enum OffersContext {
 		/// used with an [`InvoiceError`].
 		///
 		/// [`InvoiceError`]: crate::offers::invoice_error::InvoiceError
-		hmac: Option<Hmac<Sha256>>,
+		hmac: Option<[u8; 32]>,
 	},
 	/// Context used by a [`BlindedMessagePath`] as a reply path for a [`Bolt12Invoice`].
 	///
@@ -369,7 +369,7 @@ pub enum OffersContext {
 		/// used to log the received [`InvoiceError`].
 		///
 		/// [`InvoiceError`]: crate::offers::invoice_error::InvoiceError
-		hmac: Hmac<Sha256>,
+		hmac: [u8; 32],
 	},
 }
 
@@ -400,7 +400,7 @@ pub enum AsyncPaymentsContext {
 		///
 		/// Prevents the recipient from being able to deanonymize us by creating a blinded path to us
 		/// containing the expected [`PaymentId`].
-		hmac: Hmac<Sha256>,
+		hmac: [u8; 32],
 	},
 }
 

lightning/src/blinded_path/payment.rs

@@ -264,7 +264,7 @@ pub struct ReceiveTlvs {
 	/// The TLVs for which the HMAC in `authentication` is derived.
 	pub(crate) tlvs: UnauthenticatedReceiveTlvs,
 	/// An HMAC of `tlvs` along with a nonce used to construct it.
-	pub(crate) authentication: (Hmac<Sha256>, Nonce),
+	pub(crate) authentication: ([u8; 32], Nonce),
 }
 
 impl ReceiveTlvs {

lightning/src/ln/channelmanager.rs

@@ -456,11 +456,11 @@ pub trait Verification {
 	/// [`Nonce`].
 	fn hmac_for_offer_payment(
 		&self, nonce: Nonce, expanded_key: &inbound_payment::ExpandedKey,
-	) -> Hmac<Sha256>;
+	) -> [u8; 32];
 
 	/// Authenticates the data using an HMAC and a [`Nonce`] taken from an [`OffersContext`].
 	fn verify_for_offer_payment(
-		&self, hmac: Hmac<Sha256>, nonce: Nonce, expanded_key: &inbound_payment::ExpandedKey,
+		&self, hmac: [u8; 32], nonce: Nonce, expanded_key: &inbound_payment::ExpandedKey,
 	) -> Result<(), ()>;
 }
 
@@ -469,29 +469,31 @@ impl Verification for PaymentHash {
 	/// along with the given [`Nonce`].
 	fn hmac_for_offer_payment(
 		&self, nonce: Nonce, expanded_key: &inbound_payment::ExpandedKey,
-	) -> Hmac<Sha256> {
-		signer::hmac_for_payment_hash(*self, nonce, expanded_key)
+	) -> [u8; 32] {
+		signer::hmac_for_payment_hash(*self, nonce, expanded_key).to_byte_array()
 	}
 
 	/// Authenticates the payment id using an HMAC and a [`Nonce`] taken from an
 	/// [`OffersContext::InboundPayment`].
 	fn verify_for_offer_payment(
-		&self, hmac: Hmac<Sha256>, nonce: Nonce, expanded_key: &inbound_payment::ExpandedKey,
+		&self, hmac: [u8; 32], nonce: Nonce, expanded_key: &inbound_payment::ExpandedKey,
 	) -> Result<(), ()> {
+		let hmac = bitcoin::hashes::hmac::Hmac::from_byte_array(hmac);
 		signer::verify_payment_hash(*self, hmac, nonce, expanded_key)
 	}
 }
 
 impl Verification for UnauthenticatedReceiveTlvs {
 	fn hmac_for_offer_payment(
 		&self, nonce: Nonce, expanded_key: &inbound_payment::ExpandedKey,
-	) -> Hmac<Sha256> {
-		signer::hmac_for_payment_tlvs(self, nonce, expanded_key)
+	) -> [u8; 32] {
+		signer::hmac_for_payment_tlvs(self, nonce, expanded_key).to_byte_array()
 	}
 
 	fn verify_for_offer_payment(
-		&self, hmac: Hmac<Sha256>, nonce: Nonce, expanded_key: &inbound_payment::ExpandedKey,
+		&self, hmac: [u8; 32], nonce: Nonce, expanded_key: &inbound_payment::ExpandedKey,
 	) -> Result<(), ()> {
+		let hmac = bitcoin::hashes::hmac::Hmac::from_byte_array(hmac);
 		signer::verify_payment_tlvs(self, hmac, nonce, expanded_key)
 	}
 }
@@ -512,16 +514,17 @@ impl PaymentId {
 	#[cfg(async_payments)]
 	pub fn hmac_for_async_payment(
 		&self, nonce: Nonce, expanded_key: &inbound_payment::ExpandedKey,
-	) -> Hmac<Sha256> {
-		signer::hmac_for_async_payment_id(*self, nonce, expanded_key)
+	) -> [u8; 32] {
+		signer::hmac_for_async_payment_id(*self, nonce, expanded_key).to_byte_array()
 	}
 
 	/// Authenticates the payment id using an HMAC and a [`Nonce`] taken from an
 	/// [`AsyncPaymentsContext::OutboundPayment`].
 	#[cfg(async_payments)]
 	pub fn verify_for_async_payment(
-		&self, hmac: Hmac<Sha256>, nonce: Nonce, expanded_key: &inbound_payment::ExpandedKey,
+		&self, hmac: [u8; 32], nonce: Nonce, expanded_key: &inbound_payment::ExpandedKey,
 	) -> Result<(), ()> {
+		let hmac = bitcoin::hashes::hmac::Hmac::from_byte_array(hmac);
 		signer::verify_async_payment_id(*self, hmac, nonce, expanded_key)
 	}
 }
@@ -531,15 +534,16 @@ impl Verification for PaymentId {
 	/// along with the given [`Nonce`].
 	fn hmac_for_offer_payment(
 		&self, nonce: Nonce, expanded_key: &inbound_payment::ExpandedKey,
-	) -> Hmac<Sha256> {
-		signer::hmac_for_offer_payment_id(*self, nonce, expanded_key)
+	) -> [u8; 32] {
+		signer::hmac_for_offer_payment_id(*self, nonce, expanded_key).to_byte_array()
 	}
 
 	/// Authenticates the payment id using an HMAC and a [`Nonce`] taken from an
 	/// [`OffersContext::OutboundPayment`].
 	fn verify_for_offer_payment(
-		&self, hmac: Hmac<Sha256>, nonce: Nonce, expanded_key: &inbound_payment::ExpandedKey,
+		&self, hmac: [u8; 32], nonce: Nonce, expanded_key: &inbound_payment::ExpandedKey,
 	) -> Result<(), ()> {
+		let hmac = bitcoin::hashes::hmac::Hmac::from_byte_array(hmac);
 		signer::verify_offer_payment_id(*self, hmac, nonce, expanded_key)
 	}
 }