fix block sizes for blake2 hashes

Author: newpavlov

blake2/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "blake2"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
 description = "BLAKE2 hash functions"

blake2/src/blake2.rs

@@ -1,7 +1,7 @@
 macro_rules! blake2_impl {
     (
         $state:ident, $fix_state:ident, $word:ident, $vec:ident, $bytes:ident,
-        $R1:expr, $R2:expr, $R3:expr, $R4:expr, $IV:expr,
+        $block_size:ident, $R1:expr, $R2:expr, $R3:expr, $R4:expr, $IV:expr,
         $vardoc:expr, $doc:expr,
     ) => {
 
@@ -237,7 +237,7 @@ macro_rules! blake2_impl {
         }
 
         impl BlockInput for $state {
-            type BlockSize = $bytes;
+            type BlockSize = $block_size;
         }
 
         impl Input for $state {
@@ -291,7 +291,7 @@ macro_rules! blake2_impl {
         }
 
         impl BlockInput for $fix_state {
-            type BlockSize = $bytes;
+            type BlockSize = $block_size;
         }
 
         impl Input for $fix_state {

blake2/src/blake2b.rs

@@ -1,7 +1,7 @@
-use digest::generic_array::typenum::U64;
+use digest::generic_array::typenum::{U64, U128};
 use consts::BLAKE2B_IV;
 
-blake2_impl!(VarBlake2b, Blake2b, u64, u64x4, U64,
+blake2_impl!(VarBlake2b, Blake2b, u64, u64x4, U64, U128,
     32, 24, 16, 63, BLAKE2B_IV,
     "Blake2b instance with a variable output.",
     "Blake2b instance with a fixed output.",

blake2/src/blake2s.rs

@@ -1,7 +1,7 @@
-use digest::generic_array::typenum::U32;
+use digest::generic_array::typenum::{U32, U64};
 use consts::BLAKE2S_IV;
 
-blake2_impl!(VarBlake2s, Blake2s, u32, u32x4, U32,
+blake2_impl!(VarBlake2s, Blake2s, u32, u32x4, U32, U64,
     16, 12, 8, 7, BLAKE2S_IV,
     "Blake2s instance with a variable output.",
     "Blake2s instance with a fixed output.",