Merge pull request #214 from wasmerio/fix/better-hashing

Improved hashing algorithm
wasmerio · Feb 26, 2019 · e5dc0b1 · e5dc0b1
2 parents f2886db + e6d0f91
commit e5dc0b1
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lib/runtime-core/Cargo.toml b/lib/runtime-core/Cargo.toml
@@ -29,8 +29,8 @@ version = "1.0"
 version = "0.10"
 [dependencies.serde-bench]
 version = "0.0.7"
-[dependencies.meowhash]
-version = "0.1.2"
+[dependencies.blake2b_simd]
+version = "0.4.1"
 [dependencies.digest]
 version = "0.8.0"
 [dependencies.hashbrown]

diff --git a/lib/runtime-core/src/cache.rs b/lib/runtime-core/src/cache.rs
@@ -2,8 +2,7 @@ use crate::{
     module::{Module, ModuleInfo},
     sys::Memory,
 };
-use digest::Digest;
-use meowhash::MeowHasher;
+use blake2b_simd::blake2bp;
 use std::{fmt, io, mem, slice};
 
 #[derive(Debug)]
@@ -45,7 +44,12 @@ impl WasmHash {
     pub fn generate(wasm: &[u8]) -> Self {
         let mut first_part = [0u8; 32];
         let mut second_part = [0u8; 32];
-        let generic_array = MeowHasher::digest(wasm);
+
+        let mut state = blake2bp::State::new();
+        state.update(wasm);
+
+        let mut 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]);