Add an option to in-place decrypt with ChaCha20Poly1305

In the next commit we'll use this to avoid an allocation when
deserializing messages from the wire.

Author: TheBlueMatt

lightning/src/util/chacha20poly1305rfc.rs

@@ -122,19 +122,24 @@ 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(super) fn decrypt_in_place(&mut self, input_output: &mut [u8]) {
+		pub fn decrypt_in_place(&mut self, input_output: &mut [u8], tag: &[u8]) -> Result<(), ()> {
+			self.just_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 just_decrypt_in_place(&mut self, input_output: &mut [u8]) {
 			debug_assert!(self.finished == false);
 			self.mac.input(input_output);
 			self.data_len += input_output.len();
 			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;
@@ -168,7 +173,7 @@ impl<'a, R: Read> Read for ChaChaPolyReader<'a, R> {
 	fn read(&mut self, dest: &mut [u8]) -> Result<usize, io::Error> {
 		let res = self.read.read(dest)?;
 		if res > 0 {
-			self.chacha.decrypt_in_place(&mut dest[0..res]);
+			self.chacha.just_decrypt_in_place(&mut dest[0..res]);
 		}
 		Ok(res)
 	}
@@ -313,7 +318,7 @@ mod fuzzy_chachapoly {
 			true
 		}
 
-		pub(super) fn decrypt_in_place(&mut self, _input: &mut [u8]) {
+		pub(super) fn just_decrypt_in_place(&mut self, _input: &mut [u8]) {
 			assert!(self.finished == false);
 		}