Back to ring crate from rust-crypto ones, but it did not fix the tests

Cargo.toml

@@ -32,8 +32,7 @@ failure = "0.1.3"
 # Note: hashbrown is going to be merged into Rust std
 hashbrown = "0.1.7"
 sha2 = "0.8.0"
-hmac = "0.7.0"
-pbkdf2 = { version = "0.3.0", features=["parallel"], default-features = false }
+ring = "0.14.3"
 rand = "0.6.1"
 once_cell = { version = "0.1.6", features = [ "parking_lot" ] }
 

src/crypto.rs

@@ -5,12 +5,11 @@
 //! [Seed]: ../seed/struct.Seed.html
 //!
 
-extern crate rand;
-use self::rand::{ thread_rng, RngCore };
+use rand::{ thread_rng, RngCore };
+use ring::{digest, pbkdf2};
 use sha2::Digest;
-use hmac::Hmac;
 
-const PBKDF2_ROUNDS: usize = 2048;
+const PBKDF2_ROUNDS: u32 = 2048;
 const PBKDF2_BYTES: usize = 64;
 
 /// SHA256 helper function, internal to the crate
@@ -36,8 +35,9 @@ pub(crate) fn gen_random_bytes(byte_length: usize) -> Vec<u8> {
 ///
 pub(crate) fn pbkdf2(input: &[u8], salt: &str) -> Vec<u8> {
     let mut seed = vec![0u8; PBKDF2_BYTES];
+    static DIGEST_ALG: &'static digest::Algorithm = &digest::SHA512;
 
-    pbkdf2::pbkdf2::<Hmac<sha2::Sha512>>(input, salt.as_bytes(), PBKDF2_ROUNDS, &mut seed);
+    pbkdf2::derive(DIGEST_ALG, std::num::NonZeroU32::new(PBKDF2_ROUNDS).unwrap(), salt.as_bytes(), input, &mut seed);
 
     seed
 }

src/lib.rs

@@ -29,10 +29,10 @@
 //!
 #[macro_use] extern crate failure;
 #[macro_use] extern crate once_cell;
-extern crate pbkdf2;
 extern crate hashbrown;
 extern crate sha2;
-extern crate hmac;
+extern crate ring;
+extern crate rand;
 
 mod mnemonic;
 mod error;