diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/datastructures.rs | 5 | ||||
| -rw-r--r-- | src/test.rs | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/datastructures.rs b/src/datastructures.rs index 82c0325..8b8637f 100644 --- a/src/datastructures.rs +++ b/src/datastructures.rs @@ -18,7 +18,7 @@ use anyhow::Result; use argon2::{ Argon2, - password_hash::{PasswordHash, PasswordHasher, PasswordVerifier, SaltString, rand_core::OsRng}, + password_hash::{PasswordHasher, PasswordVerifier, phc::PasswordHash}, }; use base64::Engine; use log::error; @@ -455,11 +455,10 @@ impl FormData { pub fn gen_string_argon2_hash(s: &str) -> Result<String> { let passwd = s.as_bytes(); - let salt = SaltString::generate(&mut OsRng); let argon2_alg = Argon2::default(); - Ok(argon2_alg.hash_password(passwd, &salt).unwrap().to_string()) + Ok(argon2_alg.hash_password(passwd).unwrap().to_string()) } pub fn set_password(&mut self, password: String) { diff --git a/src/test.rs b/src/test.rs index e71aee4..f9c6981 100644 --- a/src/test.rs +++ b/src/test.rs @@ -26,7 +26,7 @@ mod core { }; use argon2::{ Argon2, - password_hash::{PasswordHash, PasswordHasher, PasswordVerifier, SaltString}, + password_hash::{PasswordHasher, PasswordVerifier, phc::PasswordHash}, }; use redis::AsyncCommands; use std::io::{Read, Write}; @@ -37,13 +37,11 @@ mod core { #[test] fn test_argon2() { - use argon2::password_hash::rand_core::OsRng; let passwd = b"hunter2"; - let salt = SaltString::generate(&mut OsRng); let argon2 = Argon2::default(); - argon2.hash_password(passwd, &salt).unwrap(); + argon2.hash_password(passwd).unwrap(); } #[test] |