merge main

appauth/src/token.rs

@@ -2,6 +2,7 @@ use rsa::Pkcs1v15Encrypt;
 use rsa::{
     RsaPrivateKey, RsaPublicKey,
     pkcs8::{DecodePrivateKey, DecodePublicKey},
+    rand_core::OsRng,
 };
 use serde::{Deserialize, Serialize};
 use std::io::{Error, Result};
@@ -19,9 +20,7 @@ pub struct Token {
 pub fn gencode(token: &Token, key: &str) -> Result<String> {
     let data = serde_json::to_vec(token)?;
     let public_key = RsaPublicKey::from_public_key_pem(key).map_err(Error::other)?;
-    let encrypted_data = public_key
-        .encrypt(&mut rand::thread_rng(), Pkcs1v15Encrypt, &data)
-        .map_err(Error::other)?;
+    let encrypted_data = public_key.encrypt(&mut OsRng, Pkcs1v15Encrypt, &data).map_err(Error::other)?;
     Ok(base64_simd::URL_SAFE_NO_PAD.encode_to_string(&encrypted_data))
 }
 
@@ -65,7 +64,7 @@ mod tests {
     use std::time::{SystemTime, UNIX_EPOCH};
     #[test]
     fn test_gencode_and_parse() {
-        let mut rng = rand::thread_rng();
+        let mut rng = OsRng;
         let bits = 2048;
         let private_key = RsaPrivateKey::new(&mut rng, bits).expect("Failed to generate private key");
         let public_key = RsaPublicKey::from(&private_key);
@@ -88,7 +87,7 @@ mod tests {
 
     #[test]
     fn test_parse_invalid_token() {
-        let private_key_pem = RsaPrivateKey::new(&mut rand::thread_rng(), 2048)
+        let private_key_pem = RsaPrivateKey::new(&mut OsRng, 2048)
             .expect("Failed to generate private key")
             .to_pkcs8_pem(LineEnding::LF)
             .unwrap();