Change decrypt_in_place to return a Result.

Author: G8XSU

src/crypto/chacha20poly1305.rs

@@ -76,10 +76,14 @@ mod real_chachapoly {
 			self.finish_and_get_tag(out_tag);
 		}
 
-		pub fn decrypt_inplace(&mut self, input_output: &mut [u8], tag: &[u8]) -> bool {
+		pub fn decrypt_inplace(&mut self, input_output: &mut [u8], tag: &[u8]) -> Result<(), ()> {
 			assert!(self.finished == false);
 			self.decrypt_in_place(input_output);
-			self.finish_and_check_tag(tag)
+			if self.finish_and_check_tag(tag) {
+				Ok(())
+			} else {
+				Err(())
+			}
 		}
 
 		// Encrypt `input_output` in-place. To finish and calculate the tag, use `finish_and_get_tag`

src/util/storable_builder.rs

@@ -67,13 +67,13 @@ impl<T: EntropySource> StorableBuilder<T> {
 		let mut cipher =
 			ChaCha20Poly1305::new(&self.data_encryption_key, &encryption_metadata.nonce, &[]);
 
-		if cipher.decrypt_inplace(&mut storable.data, encryption_metadata.tag.borrow()) {
-			let data_blob = PlaintextBlob::decode(&storable.data[..])
-				.map_err(|e| Error::new(ErrorKind::InvalidData, e))?;
-			Ok((data_blob.value, data_blob.version))
-		} else {
-			Err(Error::new(ErrorKind::InvalidData, "Invalid Tag"))
-		}
+		cipher
+			.decrypt_inplace(&mut storable.data, encryption_metadata.tag.borrow())
+			.map_err(|_| Error::new(ErrorKind::InvalidData, "Invalid Tag"))?;
+
+		let data_blob = PlaintextBlob::decode(&storable.data[..])
+			.map_err(|e| Error::new(ErrorKind::InvalidData, e))?;
+		Ok((data_blob.value, data_blob.version))
 	}
 }