Update to latest upstream rust-bitcoin

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

diff --git a/lightning/src/util/chacha20.rs b/lightning/src/util/chacha20.rs
index 09e9a847598e10d51071ab1e3aa2d805d1f15860..77329cba458753ddb53b1152c64dc73ba7c814a3 100644 (file)
--- a/lightning/src/util/chacha20.rs
+++ b/lightning/src/util/chacha20.rs
@@ -2,12 +2,12 @@
 // 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;
 
@@ -56,6 +56,8 @@ mod real_chacha {
                }
        }
 
+       const BLOCK_SIZE: usize = 64;
+
        #[derive(Clone,Copy)]
        struct ChaChaState {
                a: u32x4,
@@ -67,7 +69,7 @@ mod real_chacha {
        #[derive(Copy)]
        pub struct ChaCha20 {
                state  : ChaChaState,
-               output : [u8; 64],
+               output : [u8; BLOCK_SIZE],
                offset : usize,
        }
 
@@ -135,7 +137,7 @@ mod real_chacha {
                        assert!(key.len() == 16 || key.len() == 32);
                        assert!(nonce.len() == 8 || nonce.len() == 12);
 
-                       ChaCha20{ state: ChaCha20::expand(key, nonce), output: [0u8; 64], offset: 64 }
+                       ChaCha20{ state: ChaCha20::expand(key, nonce), output: [0u8; BLOCK_SIZE], offset: 64 }
                }
 
                fn expand(key: &[u8], nonce: &[u8]) -> ChaChaState {
@@ -197,7 +199,7 @@ mod real_chacha {
                        }
                }
 
-               // put the the next 64 keystream bytes into self.output
+               // put the the next BLOCK_SIZE keystream bytes into self.output
                fn update(&mut self) {
                        let mut state = self.state;
 
@@ -234,12 +236,12 @@ mod real_chacha {
                        while i < len {
                                // If there is no keystream available in the output buffer,
                                // generate the next block.
-                               if self.offset == 64 {
+                               if self.offset == BLOCK_SIZE {
                                        self.update();
                                }
 
                                // Process the min(available keystream, remaining input length).
-                               let count = cmp::min(64 - self.offset, len - i);
+                               let count = cmp::min(BLOCK_SIZE - self.offset, len - i);
                                // explicitly assert lengths to avoid bounds checks:
                                assert!(output.len() >= i + count);
                                assert!(input.len() >= i + count);
@@ -258,12 +260,12 @@ mod real_chacha {
                        while i < len {
                                // If there is no keystream available in the output buffer,
                                // generate the next block.
-                               if self.offset == 64 {
+                               if self.offset == BLOCK_SIZE {
                                        self.update();
                                }
 
                                // Process the min(available keystream, remaining input length).
-                               let count = cmp::min(64 - self.offset, len - i);
+                               let count = cmp::min(BLOCK_SIZE - self.offset, len - i);
                                // explicitly assert lengths to avoid bounds checks:
                                assert!(input_output.len() >= i + count);
                                assert!(self.output.len() >= self.offset + count);