switch the BLAKE2 implementation to blake2b_simd/blake2s_simd

.github/workflows/blake2.yml

@@ -53,15 +53,3 @@ jobs:
         override: true
     - run: cargo test --no-default-features
     - run: cargo test
-  simd:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly
-          override: true
-      - run: cargo test --features simd
-      - run: cargo test --features simd_opt
-      - run: cargo test --features simd_asm

blake2/Cargo.toml

@@ -12,6 +12,8 @@ keywords = ["crypto", "blake2", "hash", "digest"]
 categories = ["cryptography", "no-std"]
 
 [dependencies]
+blake2b_simd = { version = "0.5.10", default-features = false }
+blake2s_simd = { version = "0.5.10", default-features = false }
 digest = "0.9"
 crypto-mac = "0.8"
 opaque-debug = "0.3"
@@ -23,7 +25,4 @@ hex-literal = "0.2"
 
 [features]
 default = ["std"]
-std = ["digest/std", "crypto-mac/std"]
-simd = []
-simd_opt = ["simd"]
-simd_asm = ["simd_opt"]
+std = ["digest/std", "crypto-mac/std", "blake2b_simd/std", "blake2s_simd/std"]

blake2/benches/blake2bp.rs

@@ -0,0 +1,4 @@
+#![no_std]
+#![feature(test)]
+
+digest::bench!(blake2::Blake2bp);

blake2/benches/blake2sp.rs

@@ -0,0 +1,4 @@
+#![no_std]
+#![feature(test)]
+
+digest::bench!(blake2::Blake2sp);

blake2/src/blake2b.rs

@@ -1,18 +1,44 @@
-use crate::consts::BLAKE2B_IV;
 use digest::generic_array::typenum::{U128, U64};
 
 blake2_impl!(
     VarBlake2b,
     Blake2b,
-    u64,
-    u64x4,
-    U64,
+    blake2b_simd::State,
+    blake2b_simd::Params,
     U128,
-    32,
-    24,
-    16,
-    63,
-    BLAKE2B_IV,
+    U64,
+    U64,
     "Blake2b instance with a variable output.",
     "Blake2b instance with a fixed output.",
 );
+
+impl VarBlake2b {
+    /// Creates a new hashing context with the full set of sequential-mode parameters.
+    pub fn with_params(key: &[u8], salt: &[u8], persona: &[u8], output_size: usize) -> Self {
+        let mut upstream_params = blake2b_simd::Params::new();
+        upstream_params
+            .key(key)
+            .salt(salt)
+            .personal(persona)
+            .hash_length(output_size);
+        let upstream_state = upstream_params.to_state();
+        Self {
+            upstream_params,
+            upstream_state,
+            output_size,
+        }
+    }
+}
+
+impl Blake2b {
+    /// Creates a new hashing context with the full set of sequential-mode parameters.
+    pub fn with_params(key: &[u8], salt: &[u8], persona: &[u8]) -> Self {
+        let mut upstream_params = blake2b_simd::Params::new();
+        upstream_params.key(key).salt(salt).personal(persona);
+        let upstream_state = upstream_params.to_state();
+        Self {
+            upstream_params,
+            upstream_state,
+        }
+    }
+}

blake2/src/blake2bp.rs

@@ -0,0 +1,13 @@
+use digest::generic_array::typenum::{U128, U64};
+
+blake2_impl!(
+    VarBlake2bp,
+    Blake2bp,
+    blake2b_simd::blake2bp::State,
+    blake2b_simd::blake2bp::Params,
+    U128,
+    U64,
+    U64,
+    "Blake2bp instance with a variable output.",
+    "Blake2bp instance with a fixed output.",
+);

blake2/src/blake2s.rs

@@ -1,18 +1,44 @@
-use crate::consts::BLAKE2S_IV;
 use digest::generic_array::typenum::{U32, U64};
 
 blake2_impl!(
     VarBlake2s,
     Blake2s,
-    u32,
-    u32x4,
-    U32,
+    blake2s_simd::State,
+    blake2s_simd::Params,
     U64,
-    16,
-    12,
-    8,
-    7,
-    BLAKE2S_IV,
+    U32,
+    U32,
     "Blake2s instance with a variable output.",
     "Blake2s instance with a fixed output.",
 );
+
+impl VarBlake2s {
+    /// Creates a new hashing context with the full set of sequential-mode parameters.
+    pub fn with_params(key: &[u8], salt: &[u8], persona: &[u8], output_size: usize) -> Self {
+        let mut upstream_params = blake2s_simd::Params::new();
+        upstream_params
+            .key(key)
+            .salt(salt)
+            .personal(persona)
+            .hash_length(output_size);
+        let upstream_state = upstream_params.to_state();
+        Self {
+            upstream_params,
+            upstream_state,
+            output_size,
+        }
+    }
+}
+
+impl Blake2s {
+    /// Creates a new hashing context with the full set of sequential-mode parameters.
+    pub fn with_params(key: &[u8], salt: &[u8], persona: &[u8]) -> Self {
+        let mut upstream_params = blake2s_simd::Params::new();
+        upstream_params.key(key).salt(salt).personal(persona);
+        let upstream_state = upstream_params.to_state();
+        Self {
+            upstream_params,
+            upstream_state,
+        }
+    }
+}

blake2/src/blake2sp.rs

@@ -0,0 +1,13 @@
+use digest::generic_array::typenum::{U32, U64};
+
+blake2_impl!(
+    VarBlake2sp,
+    Blake2sp,
+    blake2s_simd::blake2sp::State,
+    blake2s_simd::blake2sp::Params,
+    U64,
+    U32,
+    U32,
+    "Blake2sp instance with a variable output.",
+    "Blake2sp instance with a fixed output.",
+);

blake2/src/lib.rs

@@ -84,25 +84,22 @@
 #![no_std]
 #![doc(html_logo_url = "https://raw.githubusercontent.com/RustCrypto/meta/master/logo_small.png")]
 #![warn(missing_docs, rust_2018_idioms)]
-#![cfg_attr(feature = "simd", feature(platform_intrinsics, repr_simd))]
-#![cfg_attr(feature = "simd_asm", feature(asm))]
 
 #[cfg(feature = "std")]
 extern crate std;
 
-mod as_bytes;
-mod consts;
-
-mod simd;
-
 #[macro_use]
 mod blake2;
 
 mod blake2b;
+mod blake2bp;
 mod blake2s;
+mod blake2sp;
 
 pub use crypto_mac;
 pub use digest::{self, Digest};
 
 pub use crate::blake2b::{Blake2b, VarBlake2b};
+pub use crate::blake2bp::{Blake2bp, VarBlake2bp};
 pub use crate::blake2s::{Blake2s, VarBlake2s};
+pub use crate::blake2sp::{Blake2sp, VarBlake2sp};