From: Valentine Wallace <vwallace@protonmail.com>
Date: Thu, 26 Oct 2023 16:59:42 +0000 (-0400)
Subject: onion_utils: extract decrypting faiure packet into method
X-Git-Tag: v0.0.119~36^2~20
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=7f765a39bcf1464fab92d19b6ecd6f38e296a30e;p=rust-lightning

onion_utils: extract decrypting faiure packet into method

Will be used in the next commit to parse onion errors from blinded paths in
tests only.
---

diff --git a/lightning/src/ln/onion_utils.rs b/lightning/src/ln/onion_utils.rs
index 31f2f7827..08fe7a73a 100644
--- a/lightning/src/ln/onion_utils.rs
+++ b/lightning/src/ln/onion_utils.rs
@@ -433,11 +433,22 @@ pub(crate) struct DecodedOnionFailure {
 	pub(crate) onion_error_data: Option<Vec<u8>>,
 }
 
+/// Note that we always decrypt `packet` in-place here even if the deserialization into
+/// [`msgs::DecodedOnionErrorPacket`] ultimately fails.
+fn decrypt_onion_error_packet(
+	packet: &mut Vec<u8>, shared_secret: SharedSecret
+) -> Result<msgs::DecodedOnionErrorPacket, msgs::DecodeError> {
+	let ammag = gen_ammag_from_shared_secret(shared_secret.as_ref());
+	let mut chacha = ChaCha20::new(&ammag, &[0u8; 8]);
+	chacha.process_in_place(packet);
+	msgs::DecodedOnionErrorPacket::read(&mut Cursor::new(packet))
+}
+
 /// Process failure we got back from upstream on a payment we sent (implying htlc_source is an
 /// OutboundRoute).
 #[inline]
 pub(super) fn process_onion_failure<T: secp256k1::Signing, L: Deref>(
-	secp_ctx: &Secp256k1<T>, logger: &L, htlc_source: &HTLCSource, mut packet_decrypted: Vec<u8>
+	secp_ctx: &Secp256k1<T>, logger: &L, htlc_source: &HTLCSource, mut encrypted_packet: Vec<u8>
 ) -> DecodedOnionFailure where L::Target: Logger {
 	let (path, session_priv, first_hop_htlc_msat) = if let &HTLCSource::OutboundRoute {
 		ref path, ref session_priv, ref first_hop_htlc_msat, ..
@@ -504,15 +515,7 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing, L: Deref>(
 		let amt_to_forward = htlc_msat - route_hop.fee_msat;
 		htlc_msat = amt_to_forward;
 
-		let ammag = gen_ammag_from_shared_secret(shared_secret.as_ref());
-
-		let mut decryption_tmp = Vec::with_capacity(packet_decrypted.len());
-		decryption_tmp.resize(packet_decrypted.len(), 0);
-		let mut chacha = ChaCha20::new(&ammag, &[0u8; 8]);
-		chacha.process(&packet_decrypted, &mut decryption_tmp[..]);
-		packet_decrypted = decryption_tmp;
-
-		let err_packet = match msgs::DecodedOnionErrorPacket::read(&mut Cursor::new(&packet_decrypted)) {
+		let err_packet = match decrypt_onion_error_packet(&mut encrypted_packet, shared_secret) {
 			Ok(p) => p,
 			Err(_) => return
 		};