X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fchacha20poly1305rfc.rs;h=fdd51e757b5bd12f1b973db7737efb802c3d2284;hb=963f8d93b58ebf5d5ee1d6e3e3654c11a4597a0f;hp=41a218bd58890833fb9ee3a5cfae88ba1453fe1c;hpb=22a0dd5f339058fd6733920ffca0f5eb64db4e32;p=rust-lightning

diff --git a/lightning/src/util/chacha20poly1305rfc.rs b/lightning/src/util/chacha20poly1305rfc.rs
index 41a218bd..fdd51e75 100644
--- a/lightning/src/util/chacha20poly1305rfc.rs
+++ b/lightning/src/util/chacha20poly1305rfc.rs
@@ -16,8 +16,6 @@ mod real_chachapoly {
 	use util::poly1305::Poly1305;
 	use bitcoin::hashes::cmp::fixed_time_eq;
 
-	use util::byte_utils;
-
 	#[derive(Clone, Copy)]
 	pub struct ChaCha20Poly1305RFC {
 		cipher: ChaCha20,
@@ -51,8 +49,8 @@ mod real_chachapoly {
 			ChaCha20Poly1305RFC::pad_mac_16(&mut mac, aad.len());
 
 			ChaCha20Poly1305RFC {
-				cipher: cipher,
-				mac: mac,
+				cipher,
+				mac,
 				finished: false,
 				data_len: 0,
 				aad_len: aad.len() as u64,
@@ -67,8 +65,8 @@ mod real_chachapoly {
 			self.mac.input(output);
 			ChaCha20Poly1305RFC::pad_mac_16(&mut self.mac, self.data_len);
 			self.finished = true;
-			self.mac.input(&byte_utils::le64_to_array(self.aad_len));
-			self.mac.input(&byte_utils::le64_to_array(self.data_len as u64));
+			self.mac.input(&self.aad_len.to_le_bytes());
+			self.mac.input(&(self.data_len as u64).to_le_bytes());
 			self.mac.raw_result(out_tag);
 		}
 
@@ -82,8 +80,8 @@ mod real_chachapoly {
 
 			self.data_len += input.len();
 			ChaCha20Poly1305RFC::pad_mac_16(&mut self.mac, self.data_len);
-			self.mac.input(&byte_utils::le64_to_array(self.aad_len));
-			self.mac.input(&byte_utils::le64_to_array(self.data_len as u64));
+			self.mac.input(&self.aad_len.to_le_bytes());
+			self.mac.input(&(self.data_len as u64).to_le_bytes());
 
 			let mut calc_tag =  [0u8; 16];
 			self.mac.raw_result(&mut calc_tag);