X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fchacha20poly1305rfc.rs;h=3908116cccc85f03624c73cdb73d2ead507f0712;hb=cb83cfe366aaa07179cac1079694e9ea5c6cc9c6;hp=1d3af1ea32072b4622756dcb8ef292921293904b;hpb=88fef649b15fa030cb91de76d58346a0bc408834;p=rust-lightning

diff --git a/lightning/src/util/chacha20poly1305rfc.rs b/lightning/src/util/chacha20poly1305rfc.rs
index 1d3af1ea..3908116c 100644
--- a/lightning/src/util/chacha20poly1305rfc.rs
+++ b/lightning/src/util/chacha20poly1305rfc.rs
@@ -1,12 +1,12 @@
 // ring has a garbage API so its use is avoided, but rust-crypto doesn't have RFC-variant poly1305
 // Instead, we steal rust-crypto's implementation and tweak it to match the RFC.
-
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
+//
+// This file is licensed under the Apache License, Version 2.0 <LICENSE-APACHE
+// or http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your option.
+// You may not use this file except in accordance with one or both of these
+// licenses.
+//
 // This is a port of Andrew Moons poly1305-donna
 // https://github.com/floodyberry/poly1305-donna
 
@@ -14,7 +14,7 @@
 mod real_chachapoly {
 	use util::chacha20::ChaCha20;
 	use util::poly1305::Poly1305;
-	use bitcoin_hashes::cmp::fixed_time_eq;
+	use bitcoin::hashes::cmp::fixed_time_eq;
 
 	use util::byte_utils;
 
@@ -51,8 +51,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,