Merge pull request #926 from GeneFerneau/core

[rust-lightning] / lightning / src / util / chacha20.rs

diff --git a/lightning/src/util/chacha20.rs b/lightning/src/util/chacha20.rs
index 8a8205f8dac593b6b41bd71369f2e749c85261f2..e8c6e229c1c00129cc22ace046845c1d6b5e5922 100644 (file)
--- a/lightning/src/util/chacha20.rs
+++ b/lightning/src/util/chacha20.rs
@@ -2,24 +2,24 @@
 // Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
-
-// 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.
 
 use std::io;
 
 #[cfg(not(feature = "fuzztarget"))]
 mod real_chacha {
-       use std::cmp;
+       use core::cmp;
        use util::byte_utils::{slice_to_le32, le32_to_array};
 
        #[derive(Clone, Copy, PartialEq, Eq)]
        #[allow(non_camel_case_types)]
        struct u32x4(pub u32, pub u32, pub u32, pub u32);
-       impl ::std::ops::Add for u32x4 {
+       impl ::core::ops::Add for u32x4 {
                type Output = u32x4;
                fn add(self, rhs: u32x4) -> u32x4 {
                        u32x4(self.0.wrapping_add(rhs.0),
@@ -28,7 +28,7 @@ mod real_chacha {
                              self.3.wrapping_add(rhs.3))
                }
        }
-       impl ::std::ops::Sub for u32x4 {
+       impl ::core::ops::Sub for u32x4 {
                type Output = u32x4;
                fn sub(self, rhs: u32x4) -> u32x4 {
                        u32x4(self.0.wrapping_sub(rhs.0),
@@ -37,19 +37,19 @@ mod real_chacha {
                              self.3.wrapping_sub(rhs.3))
                }
        }
-       impl ::std::ops::BitXor for u32x4 {
+       impl ::core::ops::BitXor for u32x4 {
                type Output = u32x4;
                fn bitxor(self, rhs: u32x4) -> u32x4 {
                        u32x4(self.0 ^ rhs.0, self.1 ^ rhs.1, self.2 ^ rhs.2, self.3 ^ rhs.3)
                }
        }
-       impl ::std::ops::Shr<u32x4> for u32x4 {
+       impl ::core::ops::Shr<u32x4> for u32x4 {
                type Output = u32x4;
                fn shr(self, rhs: u32x4) -> u32x4 {
                        u32x4(self.0 >> rhs.0, self.1 >> rhs.1, self.2 >> rhs.2, self.3 >> rhs.3)
                }
        }
-       impl ::std::ops::Shl<u32x4> for u32x4 {
+       impl ::core::ops::Shl<u32x4> for u32x4 {
                type Output = u32x4;
                fn shl(self, rhs: u32x4) -> u32x4 {
                        u32x4(self.0 << rhs.0, self.1 << rhs.1, self.2 << rhs.2, self.3 << rhs.3)
@@ -318,7 +318,7 @@ impl<'a, R: io::Read> io::Read for ChaChaReader<'a, R> {
 
 #[cfg(test)]
 mod test {
-       use std::iter::repeat;
+       use core::iter::repeat;
 
        use super::ChaCha20;
 
@@ -328,7 +328,7 @@ mod test {
                        key:   [u8; 32],
                        nonce: [u8; 8],
                        keystream: Vec<u8>,
-               };
+               }
                // taken from http://tools.ietf.org/html/draft-agl-tls-chacha20poly1305-04
                let test_vectors = vec!(
                        TestVector{
@@ -463,7 +463,7 @@ mod test {
                        key:   [u8; 32],
                        nonce: [u8; 12],
                        keystream: Vec<u8>,
-               };
+               }
                // taken from http://tools.ietf.org/html/draft-agl-tls-chacha20poly1305-04
                let test_vectors = vec!(
                        TestVector{