Skip to content

Commit 8fb0d0f

Browse files
authored
Merge pull request #194 from replydev/dependabot/cargo/scrypt-0.11.0
Bump scrypt from 0.10.0 to 0.11.0
2 parents 00deb6f + 3045b63 commit 8fb0d0f

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

Cargo.lock

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ sha2 = "0.10.6"
4343
chacha20poly1305 = "0.10.1"
4444
rust-argon2 = "1.0"
4545
getrandom = "0.2.9"
46-
scrypt = "0.10.0"
46+
scrypt = "0.11.0"
4747
aes-gcm = "0.10.1"
4848
hex = "0.4.3"
4949
qrcode = "0.12.0"

src/importers/aegis_encrypted.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,12 @@ fn get_params(slot: &AegisEncryptedSlot) -> Result<Params, String> {
119119
let p = slot.p.unwrap();
120120
let r = slot.r.unwrap();
121121

122-
match Params::new((n as f32).log2() as u8, r, p) {
122+
match Params::new(
123+
(n as f32).log2() as u8,
124+
r,
125+
p,
126+
scrypt::Params::RECOMMENDED_LEN,
127+
) {
123128
Ok(result) => Ok(result),
124129
Err(e) => Err(format!("Error during scrypt params creation: {e:?}")),
125130
}
@@ -128,10 +133,7 @@ fn get_params(slot: &AegisEncryptedSlot) -> Result<Params, String> {
128133
fn get_master_key(slot: &AegisEncryptedSlot, password: &str) -> Result<Vec<u8>, String> {
129134
let salt = Vec::from_hex(slot.salt.as_ref().unwrap()).expect("Failed to parse hex salt");
130135
let mut output: [u8; 32] = [0; 32];
131-
let params = match get_params(slot) {
132-
Ok(result) => result,
133-
Err(e) => return Err(e),
134-
};
136+
let params = get_params(slot)?;
135137

136138
if let Err(e) = scrypt(
137139
password.as_bytes(),

0 commit comments

Comments
 (0)