diff --git a/Cargo.lock b/Cargo.lock index 981a2f5..419a62f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -21,7 +21,7 @@ dependencies = [ "gxhash", "hex", "hickory-resolver", - "hmac 0.13.0", + "hmac", "juniper", "juniper_rocket", "k256", @@ -34,14 +34,14 @@ dependencies = [ "p256", "prost", "quick-xml", - "rand 0.10.1", + "rand 0.8.5", "reqwest", "rocket", "rocket_cors", "sentry", "serde", "serde_json", - "sha2 0.11.0", + "sha2", "sha256", "sqlx", "thiserror 2.0.18", @@ -667,12 +667,6 @@ dependencies = [ "cc", ] -[[package]] -name = "cmov" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f88a43d011fc4a6876cb7344703e297c71dda42494fee094d5f7c76bf13f746" - [[package]] name = "combine" version = "4.6.7" @@ -849,15 +843,6 @@ dependencies = [ "hybrid-array", ] -[[package]] -name = "ctutils" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5515a3834141de9eafb9717ad39eea8247b5674e6066c404e8c4b365d2a29e" -dependencies = [ - "cmov", -] - [[package]] name = "data-encoding" version = "2.11.0" @@ -990,7 +975,6 @@ dependencies = [ "block-buffer 0.12.0", "const-oid 0.10.2", "crypto-common 0.2.1", - "ctutils", ] [[package]] @@ -1021,7 +1005,7 @@ dependencies = [ "num-traits", "pkcs8", "rfc6979", - "sha2 0.10.9", + "sha2", "signature", "zeroize", ] @@ -1568,7 +1552,7 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ - "hmac 0.12.1", + "hmac", ] [[package]] @@ -1580,15 +1564,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "hmac" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6303bc9732ae41b04cb554b844a762b4115a61bfaa81e3e83050991eeb56863f" -dependencies = [ - "digest 0.11.2", -] - [[package]] name = "home" version = "0.5.11" @@ -2192,7 +2167,7 @@ dependencies = [ "ecdsa", "elliptic-curve", "once_cell", - "sha2 0.10.9", + "sha2", "signature", ] @@ -2615,7 +2590,7 @@ dependencies = [ "ecdsa", "elliptic-curve", "primeorder", - "sha2 0.10.9", + "sha2", ] [[package]] @@ -3122,7 +3097,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ - "hmac 0.12.1", + "hmac", "subtle", ] @@ -3684,17 +3659,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "sha2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4" -dependencies = [ - "cfg-if", - "cpufeatures 0.3.0", - "digest 0.11.2", -] - [[package]] name = "sha256" version = "1.6.0" @@ -3704,7 +3668,7 @@ dependencies = [ "async-trait", "bytes", "hex", - "sha2 0.10.9", + "sha2", "tokio", ] @@ -3856,7 +3820,7 @@ dependencies = [ "percent-encoding", "serde", "serde_json", - "sha2 0.10.9", + "sha2", "smallvec", "thiserror 2.0.18", "tokio", @@ -3893,7 +3857,7 @@ dependencies = [ "quote", "serde", "serde_json", - "sha2 0.10.9", + "sha2", "sqlx-core", "sqlx-mysql", "sqlx-postgres", @@ -3926,7 +3890,7 @@ dependencies = [ "generic-array", "hex", "hkdf", - "hmac 0.12.1", + "hmac", "itoa", "log", "md-5 0.10.6", @@ -3937,7 +3901,7 @@ dependencies = [ "rsa", "serde", "sha1 0.10.6", - "sha2 0.10.9", + "sha2", "smallvec", "sqlx-core", "stringprep", @@ -3965,7 +3929,7 @@ dependencies = [ "futures-util", "hex", "hkdf", - "hmac 0.12.1", + "hmac", "home", "ipnetwork", "itoa", @@ -3976,7 +3940,7 @@ dependencies = [ "rand 0.8.5", "serde", "serde_json", - "sha2 0.10.9", + "sha2", "smallvec", "sqlx-core", "stringprep", diff --git a/Cargo.toml b/Cargo.toml index 87468d9..3ff5966 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ once_cell = "1.20.3" serde_json = "1.0.139" chrono = { version = "0.4.39", features = ["serde"] } argon2 = "0.5.3" -sha2 = "0.11.0" +sha2 = "0.10.8" bytemuck = { version = "1.21.0", features = ["derive"] } base64 = "0.22.1" hex = "0.4.3" @@ -31,7 +31,7 @@ thiserror = "2.0.11" bcrypt = "0.19.0" sqlx = { version = "0.8.3", features = [ "runtime-tokio", "tls-native-tls", "postgres", "chrono", "ipnetwork" ] } aes = "0.9.0" -hmac = "0.13.0" +hmac = "0.12.1" md-5 = "0.11.0" cbc = "0.1.2" mii = { path = "./mii" } @@ -45,7 +45,7 @@ juniper_rocket = "0.10.0" prost = "0.14.0" lettre = "0.11.15" -rand = { version = "0.10.0", features = ["std"] } +rand = "0.8.5" 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"] } \ No newline at end of file diff --git a/src/account/account.rs b/src/account/account.rs index fd58a1b..2d43166 100644 --- a/src/account/account.rs +++ b/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::prelude::*; +use rand::Rng; 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.update(&bytes_of(&pid)); - sha.update(&[0x02, 0x65, 0x43, 0x46]); - sha.update(text_password.as_bytes()); + sha.write_all(&bytes_of(&pid)).unwrap(); + sha.write_all(&[0x02, 0x65, 0x43, 0x46]).unwrap(); + sha.write_all(text_password.as_bytes()).unwrap(); hex::encode(&sha.finalize()[..]) } @@ -193,18 +193,18 @@ pub async fn read_bearer_auth_token(connection: &Pool, token: &str) -> Option String { - let mut rng = rand::rng(); + let mut rng = rand::thread_rng(); let mut output = String::with_capacity(16); while output.len() < 16 { - let offset: u8 = rng.random_range(0..62); + let offset: u8 = rng.gen_range(0..62); let character = if offset < 10 { (offset + b'0') as char } else if offset < 36 { - (offset + 55) as char // A-Z + (offset + 55) as char } else { - (offset + 61) as char // a-z + (offset + 61) as char }; output.push(character); diff --git a/src/nnid/people.rs b/src/nnid/people.rs index db9e690..7d5f721 100644 --- a/src/nnid/people.rs +++ b/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::prelude::*; +use rand::Rng; // 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, data: Xml