Merge branch 'renovate/sha2-0.x' of https://git.spbr.net/spacebar/account into renovate/sha2-0.x

Cargo.lock

@@ -34,7 +34,7 @@ dependencies = [
  "p256",
  "prost",
  "quick-xml",
- "rand 0.8.5",
+ "rand 0.10.1",
  "reqwest",
  "rocket",
  "rocket_cors",
@@ -607,12 +607,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
-[[package]]
-name = "cfg_aliases"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
-
 [[package]]
 name = "chacha20"
 version = "0.10.0"
@@ -3886,7 +3880,7 @@ dependencies = [
  "rand 0.8.5",
  "rsa",
  "serde",
- "sha1 0.10.6",
+ "sha1",
  "sha2 0.10.9",
  "smallvec",
  "sqlx-core",

Cargo.toml

@@ -45,7 +45,7 @@ juniper_rocket = "0.10.0"
 
 prost = "0.14.0"
 lettre = "0.11.15"
-rand = "0.8.5"
+rand = { version = "0.10.0", features = ["std"] }
 reqwest = "0.13.0"
 binrw = "0.15.1"
 ecdsa = { version = "0.16.9", features = ["pem", "std", "verifying"] }
@@ -55,4 +55,4 @@ k256 = "0.13.4"
 dsa = "0.6.3"
 openssl = "0.10.78"
 time = "0.3.47"
-hickory-resolver = { version = "0.24", features = ["tokio-runtime"] }
+hickory-resolver = { version = "0.24", features = ["tokio-runtime"] }

src/account/account.rs

@@ -20,7 +20,7 @@ use openssl::ecdsa::EcdsaSig;
 use openssl::error::ErrorStack;
 use openssl::nid::Nid;
 use openssl::pkey::Public;
-use rand::Rng;
+use rand::prelude::*;
 use rocket::http::Status;
 use rocket::request::{FromRequest, Outcome};
 use rocket::{Request, async_trait};
@@ -81,9 +81,9 @@ pub struct _CertificatePid {
 fn generate_nintendo_hash(pid: i32, text_password: &str) -> String {
     let mut sha = Sha256::new();
 
-    sha.write_all(&bytes_of(&pid)).unwrap();
-    sha.write_all(&[0x02, 0x65, 0x43, 0x46]).unwrap();
-    sha.write_all(text_password.as_bytes()).unwrap();
+    sha.update(&bytes_of(&pid));
+    sha.update(&[0x02, 0x65, 0x43, 0x46]);
+    sha.update(text_password.as_bytes());
 
     hex::encode(&sha.finalize()[..])
 }
@@ -193,18 +193,18 @@ pub async fn read_bearer_auth_token(connection: &Pool, token: &str) -> Option<Us
 }
 
 pub fn generate_nex_password() -> String {
-    let mut rng = rand::thread_rng();
+    let mut rng = rand::rng(); 
     let mut output = String::with_capacity(16);
 
     while output.len() < 16 {
-        let offset: u8 = rng.gen_range(0..62);
+        let offset: u8 = rng.random_range(0..62);
 
         let character = if offset < 10 {
             (offset + b'0') as char
         } else if offset < 36 {
-            (offset + 55) as char
+            (offset + 55) as char // A-Z
         } else {
-            (offset + 61) as char
+            (offset + 61) as char // a-z
         };
 
         output.push(character);

src/nnid/people.rs

@@ -11,7 +11,7 @@ use crate::nnid::timezones::{OFFSET_FROM_TIMEZONE};
 use crate::Pool;
 use crate::xml::{Xml, YesNoVal};
 use crate::email::send_verification_email;
-use rand::Rng;
+use rand::prelude::*;
 // Not in use currently.
 //use mii::{get_image_png, get_image_tga};
 use crate::mii_util::get_mii_img_url;
@@ -118,7 +118,7 @@ pub async fn create_account(database: &State<Pool>, data: Xml<AccountCreationDat
 
     let pid = next_pid(database).await;
 
-    let verification_code: i32 = rand::thread_rng().gen_range(100_000..1_000_000);
+    let verification_code: i32 = rand::rng().random_range(100_000..1_000_000);
 
     let AccountCreationData {
         user_id,