Merge pull request #353 from DaGenix/fix-blake2

Fix blake2b errors

Author: cosmycoder

src/blake2b.rs

@@ -50,10 +50,12 @@ pub struct Blake2b {
     last_node: u8,
     digest_length: u8,
     computed: bool, // whether the final digest has been computed
+    param: Blake2bParam
 }
 
 impl Clone for Blake2b { fn clone(&self) -> Blake2b { *self } }
 
+#[derive(Copy, Clone)]
 struct Blake2bParam {
     digest_length: u8,
     key_length: u8,
@@ -108,7 +110,7 @@ impl Blake2b {
         self.t[1] += if self.t[0] < inc { 1 } else { 0 };
     }
 
-    fn init0(digest_length: u8, key: &[u8]) -> Blake2b {
+    fn init0(param: Blake2bParam, digest_length: u8, key: &[u8]) -> Blake2b {
         assert!(key.len() <= BLAKE2B_KEYBYTES);
         let mut b = Blake2b {
             h: IV,
@@ -120,30 +122,31 @@ impl Blake2b {
             digest_length: digest_length,
             computed: false,
             key: [0; BLAKE2B_KEYBYTES],
-            key_length: key.len() as u8
+            key_length: key.len() as u8,
+            param: param
         };
         copy_memory(key, &mut b.key);
         b
     }
 
-    fn apply_param(&mut self, p: &Blake2bParam) {
+    fn apply_param(&mut self) {
         use std::io::Write;
         use cryptoutil::WriteExt;
 
         let mut param_bytes : [u8; 64] = [0; 64];
         {
             let mut writer: &mut [u8] = &mut param_bytes;
-            writer.write_u8(p.digest_length).unwrap();
-            writer.write_u8(p.key_length).unwrap();
-            writer.write_u8(p.fanout).unwrap();
-            writer.write_u8(p.depth).unwrap();
-            writer.write_u32_le(p.leaf_length).unwrap();
-            writer.write_u64_le(p.node_offset).unwrap();
-            writer.write_u8(p.node_depth).unwrap();
-            writer.write_u8(p.inner_length).unwrap();
-            writer.write_all(&p.reserved).unwrap();
-            writer.write_all(&p.salt).unwrap();
-            writer.write_all(&p.personal).unwrap();
+            writer.write_u8(self.param.digest_length).unwrap();
+            writer.write_u8(self.param.key_length).unwrap();
+            writer.write_u8(self.param.fanout).unwrap();
+            writer.write_u8(self.param.depth).unwrap();
+            writer.write_u32_le(self.param.leaf_length).unwrap();
+            writer.write_u64_le(self.param.node_offset).unwrap();
+            writer.write_u8(self.param.node_depth).unwrap();
+            writer.write_u8(self.param.inner_length).unwrap();
+            writer.write_all(&self.param.reserved).unwrap();
+            writer.write_all(&self.param.salt).unwrap();
+            writer.write_all(&self.param.personal).unwrap();
         }
 
         let mut param_words : [u64; 8] = [0; 8];
@@ -155,9 +158,9 @@ impl Blake2b {
 
 
     // init xors IV with input parameter block
-    fn init_param( p: &Blake2bParam, key: &[u8] ) -> Blake2b {
-        let mut b = Blake2b::init0(p.digest_length, key);
-        b.apply_param(p);
+    fn init_param( p: Blake2bParam, key: &[u8] ) -> Blake2b {
+        let mut b = Blake2b::init0(p, p.digest_length, key);
+        b.apply_param();
         b
     }
 
@@ -179,7 +182,7 @@ impl Blake2b {
 
     pub fn new(outlen: usize) -> Blake2b {
         assert!(outlen > 0 && outlen <= BLAKE2B_OUTBYTES);
-        Blake2b::init_param(&Blake2b::default_param(outlen as u8), &[])
+        Blake2b::init_param(Blake2b::default_param(outlen as u8), &[])
     }
 
     fn apply_key(&mut self) {
@@ -207,7 +210,7 @@ impl Blake2b {
             personal: [0; BLAKE2B_PERSONALBYTES],
         };
 
-        let mut b = Blake2b::init_param(&param, key);
+        let mut b = Blake2b::init_param(param, key);
         b.apply_key();
         b
     }
@@ -291,9 +294,7 @@ impl Blake2b {
             let incby = self.buflen as u64;
             self.increment_counter(incby);
             self.set_lastblock();
-            let mut temp_buf = self.buf;
-            let buf_slice = &mut temp_buf[self.buflen..];
-            for b in buf_slice.iter_mut() {
+            for b in self.buf[self.buflen..].iter_mut() {
                 *b = 0;
             }
             self.compress();
@@ -305,17 +306,7 @@ impl Blake2b {
         copy_memory(&self.buf[0..outlen], out);
     }
 
-    pub fn blake2b(out: &mut[u8], input: &[u8], key: &[u8]) {
-        let mut hasher : Blake2b = if key.len() > 0 { Blake2b::new_keyed(out.len(), key) } else { Blake2b::new(out.len()) };
-
-        hasher.update(input);
-        hasher.finalize(out);
-    }
-
-}
-
-impl Digest for Blake2b {
-    fn reset(&mut self) {
+    pub fn reset(&mut self) {
         for (h_elem, iv_elem) in self.h.iter_mut().zip(IV.iter()) {
             *h_elem = *iv_elem;
         }
@@ -331,9 +322,22 @@ impl Digest for Blake2b {
         self.buflen = 0;
         self.last_node = 0;
         self.computed = false;
-        let len = self.digest_length;
-        self.apply_param(&Blake2b::default_param(len));
+        self.apply_param();
+        if self.key_length > 0 {
+            self.apply_key();
+        }
     }
+
+    pub fn blake2b(out: &mut[u8], input: &[u8], key: &[u8]) {
+        let mut hasher : Blake2b = if key.len() > 0 { Blake2b::new_keyed(out.len(), key) } else { Blake2b::new(out.len()) };
+
+        hasher.update(input);
+        hasher.finalize(out);
+    }
+}
+
+impl Digest for Blake2b {
+    fn reset(&mut self) { Blake2b::reset(self); }
     fn input(&mut self, msg: &[u8]) { self.update(msg); }
     fn result(&mut self, out: &mut [u8]) { self.finalize(out); }
     fn output_bits(&self) -> usize { 8 * (self.digest_length as usize) }
@@ -356,24 +360,7 @@ impl Mac for Blake2b {
      * Reset the Mac state to begin processing another input stream.
      */
     fn reset(&mut self) {
-        for (h_elem, iv_elem) in self.h.iter_mut().zip(IV.iter()) {
-            *h_elem = *iv_elem;
-        }
-        for t_elem in self.t.iter_mut() {
-            *t_elem = 0;
-        }
-        for f_elem in self.f.iter_mut() {
-            *f_elem = 0;
-        }
-        for b in self.buf.iter_mut() {
-            *b = 0;
-        }
-        self.buflen = 0;
-        self.last_node = 0;
-        self.computed = false;
-        let len = self.digest_length;
-        self.apply_param(&Blake2b::default_param(len));
-        self.apply_key();
+        Blake2b::reset(self);
     }
 
     /**
@@ -405,62 +392,108 @@ mod digest_tests {
     //use cryptoutil::test::test_digest_1million_random;
     use blake2b::Blake2b;
     use digest::Digest;
+    use serialize::hex::FromHex;
 
 
     struct Test {
-        input: &'static str,
-        output_str: &'static str,
+        input: Vec<u8>,
+        output: Vec<u8>,
+        key: Option<Vec<u8>>,
     }
 
-    fn test_hash<D: Digest>(sh: &mut D, tests: &[Test]) {
-        // Test that it works when accepting the message all at once
-        for t in tests.iter() {
-            sh.input_str(t.input);
+    fn test_hash(tests: &[Test]) {
+        for t in tests {
+            let mut sh = match t.key {
+                Some(ref key) => Blake2b::new_keyed(64, &key),
+                None => Blake2b::new(64)
+            };
+
+            // Test that it works when accepting the message all at once
+            sh.input(&t.input[..]);
 
-            let out_str = sh.result_str();
-            assert!(&out_str[..] == t.output_str);
+            let mut out = [0u8; 64];
+            sh.result(&mut out);
+            assert!(&out[..] == &t.output[..]);
 
             sh.reset();
-        }
 
-        // Test that it works when accepting the message in pieces
-        for t in tests.iter() {
+            // Test that it works when accepting the message in pieces
             let len = t.input.len();
             let mut left = len;
             while left > 0 {
                 let take = (left + 1) / 2;
-                sh.input_str(&t.input[len - left..take + len - left]);
-                left = left - take;
+                sh.input(&t.input[len - left..take + len - left]);
+                left -= take;
             }
 
-            let out_str = sh.result_str();
-            assert!(&out_str[..] == t.output_str);
+            let mut out = [0u8; 64];
+            sh.result(&mut out);
+            assert!(&out[..] == &t.output[..]);
 
             sh.reset();
         }
     }
 
     #[test]
     fn test_blake2b_digest() {
-        // Examples from wikipedia
-        let wikipedia_tests = vec![
+        let tests = vec![
+            // Examples from wikipedia
             Test {
-                input: "",
-                output_str: "786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419\
-                             d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce"
+                input: vec![],
+                output: "786a02f742015903c6c6fd852552d272\
+                         912f4740e15847618a86e217f71f5419\
+                         d25e1031afee585313896444934eb04b\
+                         903a685b1448b755d56f701afe9be2ce".from_hex().unwrap(),
+                key: None
             },
             Test {
-                input: "The quick brown fox jumps over the lazy dog",
-                output_str: "a8add4bdddfd93e4877d2746e62817b116364a1fa7bc148d95090bc7333b3673\
-                             f82401cf7aa2e4cb1ecd90296e3f14cb5413f8ed77be73045b13914cdcd6a918"
+                input: "The quick brown fox jumps over the lazy dog".as_bytes().to_vec(),
+                output: "a8add4bdddfd93e4877d2746e62817b1\
+                         16364a1fa7bc148d95090bc7333b3673\
+                         f82401cf7aa2e4cb1ecd90296e3f14cb\
+                         5413f8ed77be73045b13914cdcd6a918".from_hex().unwrap(),
+                key: None
+            },
+            // from: https://github.com/BLAKE2/BLAKE2/blob/master/testvectors/blake2b-test.txt
+            Test {
+                input: vec![0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b,
+                            0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+                            0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23,
+                            0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+                            0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b,
+                            0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+                            0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53,
+                            0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
+                            0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b,
+                            0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+                            0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83,
+                            0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+                            0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b,
+                            0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
+                            0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3,
+                            0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
+                            0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb,
+                            0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
+                            0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3,
+                            0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
+                            0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb,
+                            0xfc, 0xfd, 0xfe],
+                output: vec![0x14, 0x27, 0x09, 0xd6, 0x2e, 0x28, 0xfc, 0xcc, 0xd0, 0xaf, 0x97,
+                             0xfa, 0xd0, 0xf8, 0x46, 0x5b, 0x97, 0x1e, 0x82, 0x20, 0x1d, 0xc5,
+                             0x10, 0x70, 0xfa, 0xa0, 0x37, 0x2a, 0xa4, 0x3e, 0x92, 0x48, 0x4b,
+                             0xe1, 0xc1, 0xe7, 0x3b, 0xa1, 0x09, 0x06, 0xd5, 0xd1, 0x85, 0x3d,
+                             0xb6, 0xa4, 0x10, 0x6e, 0x0a, 0x7b, 0xf9, 0x80, 0x0d, 0x37, 0x3d,
+                             0x6d, 0xee, 0x2d, 0x46, 0xd6, 0x2e, 0xf2, 0xa4, 0x61],
+                key: Some(vec![0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
+                               0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15,
+                               0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,
+                               0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b,
+                               0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
+                               0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f])
             },
         ];
 
-        let tests = wikipedia_tests;
-
-        let mut sh = Blake2b::new(64);
-
-        test_hash(&mut sh, &tests[..]);
+        test_hash(&tests[..]);
     }
 }