X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fchacha20poly1305rfc.rs;h=d5792e0ac2b35f28bc8a90d43217d1874cd0e3ce;hb=bedc2c64fcfe5fa5f85ded630e9ed2eb3c3651eb;hp=052968377a5e58fe6a4236c0812718a236eaab54;hpb=ac6e0b3fed4119c196a5e1e864239087422727ea;p=rust-lightning

diff --git a/lightning/src/util/chacha20poly1305rfc.rs b/lightning/src/util/chacha20poly1305rfc.rs
index 05296837..d5792e0a 100644
--- a/lightning/src/util/chacha20poly1305rfc.rs
+++ b/lightning/src/util/chacha20poly1305rfc.rs
@@ -122,10 +122,15 @@ mod real_chachapoly {
 			}
 		}
 
-		// Decrypt in place, without checking the tag. Use `finish_and_check_tag` to check it
-		// later when decryption finishes.
-		//
-		// Should never be `pub` because the public API should always enforce tag checking.
+		pub fn check_decrypt_in_place(&mut self, input_output: &mut [u8], tag: &[u8]) -> Result<(), ()> {
+			self.decrypt_in_place(input_output);
+			if self.finish_and_check_tag(tag) { Ok(()) } else { Err(()) }
+		}
+
+		/// Decrypt in place, without checking the tag. Use `finish_and_check_tag` to check it
+		/// later when decryption finishes.
+		///
+		/// Should never be `pub` because the public API should always enforce tag checking.
 		pub(super) fn decrypt_in_place(&mut self, input_output: &mut [u8]) {
 			debug_assert!(self.finished == false);
 			self.mac.input(input_output);
@@ -133,8 +138,8 @@ mod real_chachapoly {
 			self.cipher.process_in_place(input_output);
 		}
 
-		// If we were previously decrypting with `decrypt_in_place`, this method must be used to finish
-		// decrypting and check the tag. Returns whether or not the tag is valid.
+		/// If we were previously decrypting with `just_decrypt_in_place`, this method must be used
+		/// to check the tag. Returns whether or not the tag is valid.
 		pub(super) fn finish_and_check_tag(&mut self, tag: &[u8]) -> bool {
 			debug_assert!(self.finished == false);
 			self.finished = true;
@@ -313,6 +318,11 @@ mod fuzzy_chachapoly {
 			true
 		}
 
+		pub fn check_decrypt_in_place(&mut self, input_output: &mut [u8], tag: &[u8]) -> Result<(), ()> {
+			self.decrypt_in_place(input_output);
+			if self.finish_and_check_tag(tag) { Ok(()) } else { Err(()) }
+		}
+
 		pub(super) fn decrypt_in_place(&mut self, _input: &mut [u8]) {
 			assert!(self.finished == false);
 		}
@@ -341,9 +351,9 @@ mod tests {
 		field3: Vec<u8>,
 	}
 	impl_writeable_tlv_based!(TestWriteable, {
-		(1, field1, vec_type),
-		(2, field2, vec_type),
-		(3, field3, vec_type),
+		(1, field1, required_vec),
+		(2, field2, required_vec),
+		(3, field3, required_vec),
 	});
 
 	#[test]