Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update client-side password hashing to argon2

Browse Source
This commit is contained in:
Wu Yu Wei
2019-10-05 13:12:20 +00:00
committed by Marcel
parent bbb341e07d
commit 193ff105e2
3 changed files with 7 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
voxygen/src/menu/main/mod.rs
View File

@ -5,10 +5,10 @@ mod ui;
use super::char_selection::CharSelectionState;
use crate::{window::Event, Direction, GlobalState, PlayState, PlayStateResult};
use argon2::{self, Config};
use client_init::{ClientInit, Error as InitError};
use common::{clock::Clock, comp};
use log::warn;
use sha2::{Digest, Sha512};
#[cfg(feature = "singleplayer")]
use start_singleplayer::StartSingleplayerState;
use std::time::Duration;
@ -115,14 +115,10 @@ impl PlayState for MainMenuState {
(server_address, DEFAULT_PORT, false),
player,
{
// TODO: Switch to Argon2
let mut hasher = Sha512::new();
hasher.input(password.clone());
let mut out = String::new();
for i in hasher.result().iter() {
out.push_str(&format!("{:x}", i));
}
out
let salt = b"staticsalt_zTuGkGvybZIjZbNUDtw15";
let config = Config::default();
argon2::hash_encoded(password.as_bytes(), salt, &config)
.unwrap()
},
false,
)));