Merge pull request #60 from kayabaNerve/master

bitcoin_hashes >= 0.12, <= 0.13
This commit is contained in:
Steven Roose 2024-01-30 01:41:52 +07:00 committed by GitHub
commit 37915dc0ae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions

View File

@ -48,13 +48,13 @@ serde = { version = "1.0", default-features = false, features = [ "alloc" ], opt
zeroize = { version = "1.5", features = ["zeroize_derive"], optional = true }
# Unexported dependnecies
bitcoin_hashes = { version = "0.11.0", default-features = false }
bitcoin_hashes = { version = ">=0.12, <=0.13", default-features = false }
unicode-normalization = { version = "=0.1.22", optional = true }
[dev-dependencies]
# Enabling the "rand" feature by default to run the benches
bip39 = { path = ".", features = ["rand"] }
bitcoin_hashes = "0.11.0" # enable default features for test
bitcoin_hashes = ">=0.12,<=0.13" # enable default features for test
[package.metadata.docs.rs]

View File

@ -112,7 +112,7 @@ pub(crate) fn pbkdf2<M>(mnemonic: M, unprefixed_salt: &[u8], c: usize, res: &mut
prfc.input(unprefixed_salt);
prfc.input(&u32_to_array_be((i + 1) as u32));
let salt = hmac::Hmac::from_engine(prfc).into_inner();
let salt = hmac::Hmac::from_engine(prfc).to_byte_array();
xor(chunk, &salt);
salt
};
@ -120,7 +120,7 @@ pub(crate) fn pbkdf2<M>(mnemonic: M, unprefixed_salt: &[u8], c: usize, res: &mut
for _ in 1..c {
let mut prfc = prf.clone();
prfc.input(&salt);
salt = hmac::Hmac::from_engine(prfc).into_inner();
salt = hmac::Hmac::from_engine(prfc).to_byte_array();
xor(chunk, &salt);
}