feat: update jose-test

This commit is contained in:
2024-11-14 00:17:29 +08:00
parent 9d9575843c
commit 49d91c0dc1

View File

@@ -8,8 +8,7 @@ use josekit::jwe::alg::rsaes::RsaesJweAlgorithm;
use josekit::jwe::JweHeader; use josekit::jwe::JweHeader;
use josekit::jwk::alg::rsa::RsaKeyPair; use josekit::jwk::alg::rsa::RsaKeyPair;
use josekit::jwk::Jwk; use josekit::jwk::Jwk;
use rand::random; use rand::{random, thread_rng};
use rand::rngs::{OsRng, ThreadRng};
use rsa::{Oaep, RsaPrivateKey, RsaPublicKey}; use rsa::{Oaep, RsaPrivateKey, RsaPublicKey};
use rust_util::{opt_result, simple_error, XResult}; use rust_util::{opt_result, simple_error, XResult};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@@ -68,7 +67,7 @@ const JWE_ALG_RSA_OAEP: &str = "RSA-OAEP";
const JWE_DOT: &str = "."; const JWE_DOT: &str = ".";
pub fn generate_rsa_key_2(bits: u32) -> XResult<RsaPrivateKey> { pub fn generate_rsa_key_2(bits: u32) -> XResult<RsaPrivateKey> {
let mut rng = OsRng::default(); let mut rng = thread_rng();
Ok(RsaPrivateKey::new(&mut rng, bits as usize)?) 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, version: None,
}; };
serialize_jwe_fn(&header, payload, |data_key| -> XResult<Vec<u8>> { serialize_jwe_fn(&header, payload, |data_key| -> XResult<Vec<u8>> {
let mut r = ThreadRng::default(); let mut r = thread_rng();
Ok(opt_result!(rsa_public_key.encrypt(&mut r, Oaep::new::<Sha1>(), data_key), "Wrap key failed: {}")) Ok(opt_result!(rsa_public_key.encrypt(&mut r, Oaep::new::<Sha1>(), data_key), "Wrap key failed: {}"))
}) })
} }