From b39a95f3a361bb952f7cd3f973a4643f5a79b9b5 Mon Sep 17 00:00:00 2001 From: shockrah Date: Sun, 8 Mar 2020 19:49:10 -0700 Subject: [PATCH] rand utils no longer using payload User struct --- server/src/rand_utils.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/src/rand_utils.rs b/server/src/rand_utils.rs index 3ccc04b..fc093a7 100644 --- a/server/src/rand_utils.rs +++ b/server/src/rand_utils.rs @@ -1,5 +1,5 @@ // This modules mainly deals with creating various types of random data -use getrandom; +use getrandom::getrandom; pub fn newUserID() -> u64 { let mut buf = [0u8; 8]; @@ -9,19 +9,19 @@ pub fn newUserID() -> u64 { } } -pub fn newKey() -> Option { // Returns a random string which we later hash with bcrypt +pub fn newKey() -> String { // Returns a random string which we later hash with bcrypt let mut raw_slice = [0u8; 32]; - if let Some(_ignored) = getrandom(raw_slice) { + if let Ok(_ignored) = getrandom(&mut raw_slice) { let mut buf = String::new(); - for i in raw_slice { + for i in raw_slice.iter() { let mut cv: u8 = *i; if cv > 126 { cv %= 126; } if cv < 33 { cv += 34; } buf.push(cv as char); } - Some(buf) + buf } else { - None + "".into() } } \ No newline at end of file