Parameterize failure packet length

Prepares for new test vectors that pad to 1024 bytes.

Author: joostjager

lightning/src/ln/onion_utils.rs

@@ -39,6 +39,8 @@ use core::ops::Deref;
 #[allow(unused_imports)]
 use crate::prelude::*;
 
+const DEFAULT_MIN_FAILURE_PACKET_LEN: usize = 256;
+
 pub(crate) struct OnionKeys {
 	#[cfg(test)]
 	pub(crate) shared_secret: SharedSecret,
@@ -887,10 +889,9 @@ fn process_chacha(key: &[u8; 32], packet: &mut [u8]) {
 }
 
 fn build_unencrypted_failure_packet(
-	shared_secret: &[u8], failure_type: u16, failure_data: &[u8],
+	shared_secret: &[u8], failure_type: u16, failure_data: &[u8], min_packet_len: usize,
 ) -> OnionErrorPacket {
 	assert_eq!(shared_secret.len(), 32);
-	assert!(failure_data.len() <= 256 - 2);
 
 	let um = gen_um_from_shared_secret(&shared_secret);
 
@@ -901,9 +902,14 @@ fn build_unencrypted_failure_packet(
 		res.extend_from_slice(&failure_data[..]);
 		res
 	};
+	let pad_len = if failure_data.len() > min_packet_len - 2 {
+		0
+	} else {
+		min_packet_len - 2 - failure_data.len()
+	};
 	let pad = {
-		let mut res = Vec::with_capacity(256 - 2 - failure_data.len());
-		res.resize(256 - 2 - failure_data.len(), 0);
+		let mut res = Vec::with_capacity(pad_len);
+		res.resize(pad_len, 0);
 		res
 	};
 	let mut packet = msgs::DecodedOnionErrorPacket { hmac: [0; 32], failuremsg, pad };
@@ -918,8 +924,12 @@ fn build_unencrypted_failure_packet(
 pub(super) fn build_failure_packet(
 	shared_secret: &[u8], failure_type: u16, failure_data: &[u8],
 ) -> OnionErrorPacket {
-	let mut onion_error_packet =
-		build_unencrypted_failure_packet(shared_secret, failure_type, failure_data);
+	let mut onion_error_packet = build_unencrypted_failure_packet(
+		shared_secret,
+		failure_type,
+		failure_data,
+		DEFAULT_MIN_FAILURE_PACKET_LEN,
+	);
 
 	crypt_failure_packet(shared_secret, &mut onion_error_packet);
 
@@ -2425,6 +2435,7 @@ mod tests {
 			onion_keys[4].shared_secret.as_ref(),
 			0x2002,
 			&[0; 0],
+			DEFAULT_MIN_FAILURE_PACKET_LEN,
 		);
 		let hex = "4c2fc8bc08510334b6833ad9c3e79cd1b52ae59dfe5c2a4b23ead50f09f7ee0b0002200200fe0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
 		assert_eq!(onion_error.data, <Vec<u8>>::from_hex(hex).unwrap());
@@ -2601,6 +2612,7 @@ mod tests {
 					outer_onion_keys[0].shared_secret.as_ref(),
 					error_code,
 					&[0; 0],
+					DEFAULT_MIN_FAILURE_PACKET_LEN,
 				);
 
 				crypt_failure_packet(
@@ -2620,6 +2632,7 @@ mod tests {
 					outer_onion_keys[1].shared_secret.as_ref(),
 					error_code,
 					&[0; 0],
+					DEFAULT_MIN_FAILURE_PACKET_LEN,
 				);
 
 				crypt_failure_packet(
@@ -2648,6 +2661,7 @@ mod tests {
 					trampoline_onion_keys[0].shared_secret.as_ref(),
 					error_code,
 					&[0; 0],
+					DEFAULT_MIN_FAILURE_PACKET_LEN,
 				);
 
 				crypt_failure_packet(
@@ -2681,6 +2695,7 @@ mod tests {
 					trampoline_onion_keys[1].shared_secret.as_ref(),
 					error_code,
 					&[0; 0],
+					DEFAULT_MIN_FAILURE_PACKET_LEN,
 				);
 
 				crypt_failure_packet(