Bump argon2 #12

Merged
phoenix merged 10 commits from bump-argon2 into main 2026-11-01 19:18:31 -05:00
3 changed files with 6 additions and 4 deletions
Showing only changes of commit eb135b73a1 - Show all commits

No files matched your search

+1 -1
View File
@@ -344,7 +344,7 @@ pub mod endpoint {
Ok(salt) => { Ok(salt) => {
let updated_salt_string = hashing::generate_salt().unwrap(); let updated_salt_string = hashing::generate_salt().unwrap();
let updated_salt = simodels::user::salt::Salt { let updated_salt = simodels::user::salt::Salt {
salt: updated_salt_string.to_string(), salt: updated_salt_string.to_string().clone(),
id: salt.id, id: salt.id,
}; };
let updated_hashed_password = hashing::hash_password( let updated_hashed_password = hashing::hash_password(
+1 -1
View File
@@ -93,7 +93,7 @@ pub async fn register_user(
let salt_string = hashing::generate_salt().unwrap(); let salt_string = hashing::generate_salt().unwrap();
let mut salt = simodels::user::salt::Salt::default(); let mut salt = simodels::user::salt::Salt::default();
let generated_salt = salt_string; let generated_salt = salt_string;
salt.salt = generated_salt.to_string(); salt.salt = generated_salt.to_string().clone();
salt.id = repo::salt::insert(&pool, &salt).await.unwrap(); salt.id = repo::salt::insert(&pool, &salt).await.unwrap();
user.salt_id = salt.id; user.salt_id = salt.id;
let hashed_password = let hashed_password =
+4 -2
View File
@@ -40,9 +40,11 @@ impl SaltString {
// Err(argon2::password_hash::Error::SaltInvalid) // Err(argon2::password_hash::Error::SaltInvalid)
} }
pub fn to_string(&self) -> String { pub fn to_string(&self) -> &String {
self.raw.clone() &self.raw
} }
// pub fn final_string
} }
pub fn generate_salt() -> Result<SaltString, argon2::Error> { pub fn generate_salt() -> Result<SaltString, argon2::Error> {