Use blake3 instead of blake2_simd

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## **[Unreleased]**
 
 - [#1129](https://github.com/wasmerio/wasmer/pull/1129) Standard exception types for singlepass backend.
+- [#1140](https://github.com/wasmerio/wasmer/pull/1140) Use [`blake3`](https://github.com/BLAKE3-team/BLAKE3) as default hashing algorithm for caching.
 
 ## 0.13.1 - 2020-01-16
 - Fix bug in wapm related to the `package.wasmer_extra_flags` entry in the manifest

lib/runtime-core/Cargo.toml

@@ -13,11 +13,11 @@ edition = "2018"
 nix = "0.15"
 page_size = "0.4"
 wasmparser = "0.45.0"
-parking_lot = "0.9"
+parking_lot = "0.10.0"
 lazy_static = "1.4"
 errno = "0.2"
 libc = "0.2.60"
-hex = "0.3"
+hex = "0.4"
 smallvec = "0.6"
 bincode = "1.1"
 
@@ -36,16 +36,16 @@ version = "1.0"
 version = "0.11"
 [dependencies.serde-bench]
 version = "0.0.7"
-[dependencies.blake2b_simd]
-version = "0.5"
+[dependencies.blake3]
+version = "0.1.0"
 [dependencies.digest]
 version = "0.8"
 
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3", features = ["memoryapi"] }
 
 [build-dependencies]
-blake2b_simd = "0.5"
+blake3 = "0.1.0"
 rustc_version = "0.2"
 cc = "1.0"
 

lib/runtime-core/build.rs

@@ -1,13 +1,12 @@
-use blake2b_simd::blake2bp;
 use std::{env, fs, io::Write, path::PathBuf};
 
 const WASMER_VERSION: &'static str = env!("CARGO_PKG_VERSION");
 
 fn main() {
-    let mut state = blake2bp::State::new();
-    state.update(WASMER_VERSION.as_bytes());
+    let mut hasher = blake3::Hasher::new();
+    hasher.update(WASMER_VERSION.as_bytes());
 
-    let hasher = state.finalize();
+    let hasher = hasher.finalize();
     let hash_string = hasher.to_hex().as_str().to_owned();
 
     let crate_dir = env::var("OUT_DIR").unwrap();

lib/runtime-core/src/cache.rs

@@ -3,7 +3,6 @@
 //! and loaded to allow skipping compilation and fast startup.
 
 use crate::{module::ModuleInfo, sys::Memory};
-use blake2b_simd::blake2bp;
 use std::{io, mem, slice};
 
 /// Indicates the invalid type of invalid cache file
@@ -46,10 +45,8 @@ impl From<io::Error> for Error {
 ///
 /// [`Cache`]: trait.Cache.html
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
-// WasmHash is made up of two 32 byte arrays instead of a 64 byte array
-// because derive only works on fixed sized arrays size 32 or below
-// TODO: fix this when this gets fixed by improved const generics
-pub struct WasmHash([u8; 32], [u8; 32]);
+// WasmHash is made up of a 32 byte array
+pub struct WasmHash([u8; 32]);
 
 impl WasmHash {
     /// Hash a wasm module.
@@ -58,18 +55,8 @@ impl WasmHash {
     /// This does no verification that the supplied data
     /// is, in fact, a wasm module.
     pub fn generate(wasm: &[u8]) -> Self {
-        let mut first_part = [0u8; 32];
-        let mut second_part = [0u8; 32];
-
-        let mut state = blake2bp::State::new();
-        state.update(wasm);
-
-        let hasher = state.finalize();
-        let generic_array = hasher.as_bytes();
-
-        first_part.copy_from_slice(&generic_array[0..32]);
-        second_part.copy_from_slice(&generic_array[32..64]);
-        WasmHash(first_part, second_part)
+        let hash = blake3::hash(wasm);
+        WasmHash(hash.into())
     }
 
     /// Create the hexadecimal representation of the
@@ -86,26 +73,20 @@ impl WasmHash {
                 e
             ))
         })?;
-        if bytes.len() != 64 {
+        if bytes.len() != 32 {
             return Err(Error::DeserializeError(
-                "Prehashed keys must deserialze into exactly 64 bytes".to_string(),
+                "Prehashed keys must deserialze into exactly 32 bytes".to_string(),
             ));
         }
         use std::convert::TryInto;
-        Ok(WasmHash(
-            bytes[0..32].try_into().map_err(|e| {
-                Error::DeserializeError(format!("Could not get first 32 bytes: {}", e))
-            })?,
-            bytes[32..64].try_into().map_err(|e| {
-                Error::DeserializeError(format!("Could not get last 32 bytes: {}", e))
-            })?,
-        ))
+        Ok(WasmHash(bytes[0..32].try_into().map_err(|e| {
+            Error::DeserializeError(format!("Could not get first 32 bytes: {}", e))
+        })?))
     }
 
-    pub(crate) fn into_array(self) -> [u8; 64] {
-        let mut total = [0u8; 64];
+    pub(crate) fn into_array(self) -> [u8; 32] {
+        let mut total = [0u8; 32];
         total[0..32].copy_from_slice(&self.0);
-        total[32..64].copy_from_slice(&self.1);
         total
     }
 }