From c1e1b9c0c18e52e5db2545db1133477993165231 Mon Sep 17 00:00:00 2001 From: StNicolay Date: Sat, 6 May 2023 19:35:11 +0300 Subject: [PATCH] Updated account and master pass methods --- src/entity/account.rs | 2 +- src/entity/master_pass.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/entity/account.rs b/src/entity/account.rs index f7eac1f..aa39c2d 100644 --- a/src/entity/account.rs +++ b/src/entity/account.rs @@ -42,7 +42,7 @@ impl Cipher { pub fn encrypt(&self, value: &[u8]) -> crate::Result> { let nonce = ChaCha20Poly1305::generate_nonce(&mut OsRng); - let mut result = self.chacha.encrypt(&nonce, value).unwrap(); + let mut result = self.chacha.encrypt(&nonce, value)?; result.extend(nonce); Ok(result) } diff --git a/src/entity/master_pass.rs b/src/entity/master_pass.rs index 2b0c166..16ba11c 100644 --- a/src/entity/master_pass.rs +++ b/src/entity/master_pass.rs @@ -24,7 +24,7 @@ impl ActiveModelBehavior for ActiveModel {} fn hash_password(password: &[u8], salt: &[u8]) -> crate::Result> { let params = Params::new(14, Params::RECOMMENDED_R, Params::RECOMMENDED_P, 64)?; let mut password_hash = vec![0; 64]; - scrypt(password.as_ref(), &salt, ¶ms, &mut password_hash)?; + scrypt(password, salt, ¶ms, &mut password_hash)?; Ok(password_hash) }