diff --git a/__crypto/jose-test/src/jose.rs b/__crypto/jose-test/src/jose.rs index aa08f6c..7ca3376 100644 --- a/__crypto/jose-test/src/jose.rs +++ b/__crypto/jose-test/src/jose.rs @@ -8,8 +8,7 @@ use josekit::jwe::alg::rsaes::RsaesJweAlgorithm; use josekit::jwe::JweHeader; use josekit::jwk::alg::rsa::RsaKeyPair; use josekit::jwk::Jwk; -use rand::random; -use rand::rngs::{OsRng, ThreadRng}; +use rand::{random, thread_rng}; use rsa::{Oaep, RsaPrivateKey, RsaPublicKey}; use rust_util::{opt_result, simple_error, XResult}; use serde::{Deserialize, Serialize}; @@ -68,7 +67,7 @@ const JWE_ALG_RSA_OAEP: &str = "RSA-OAEP"; const JWE_DOT: &str = "."; pub fn generate_rsa_key_2(bits: u32) -> XResult { - let mut rng = OsRng::default(); + let mut rng = thread_rng(); Ok(RsaPrivateKey::new(&mut rng, bits as usize)?) } @@ -84,7 +83,7 @@ pub fn serialize_jwe_rsa_2(payload: &[u8], rsa_public_key: &RsaPublicKey) -> XRe version: None, }; serialize_jwe_fn(&header, payload, |data_key| -> XResult> { - let mut r = ThreadRng::default(); + let mut r = thread_rng(); Ok(opt_result!(rsa_public_key.encrypt(&mut r, Oaep::new::(), data_key), "Wrap key failed: {}")) }) }