Make use of rand_core patch: TryCoreRng::unwrap_mut

Author: baloo

Cargo.lock

@@ -78,3 +78,6 @@ crypto-bigint = { git = "https://github.com/RustCrypto/crypto-bigint.git" }
 
 # https://github.com/entropyxyz/crypto-primes/pull/74
 crypto-primes = { git = "https://github.com/baloo/crypto-primes.git", branch = "baloo/rand_core-0.9" }
+
+# https://github.com/rust-random/rand/pull/1589
+rand_core = { git = "https://github.com/rust-random/rand.git" }

Cargo.toml

@@ -237,7 +237,6 @@ pub mod traits;
 mod dummy_rng;
 mod encoding;
 mod key;
-mod unwrap_rng;
 
 pub use pkcs1;
 pub use pkcs8;

src/lib.rs

@@ -1,5 +1,5 @@
 use super::{oid, pkcs1v15_generate_prefix, sign, Signature, VerifyingKey};
-use crate::{dummy_rng::DummyRng, unwrap_rng::UnwrapRng, Result, RsaPrivateKey};
+use crate::{dummy_rng::DummyRng, Result, RsaPrivateKey};
 use alloc::vec::Vec;
 use core::marker::PhantomData;
 use digest::Digest;
@@ -133,7 +133,7 @@ where
         digest: D,
     ) -> signature::Result<Signature> {
         sign(
-            Some(&mut UnwrapRng(rng)),
+            Some(&mut rng.unwrap_mut()),
             &self.inner,
             &self.prefix,
             &digest.finalize(),
@@ -153,7 +153,7 @@ where
         msg: &[u8],
     ) -> signature::Result<Signature> {
         sign(
-            Some(&mut UnwrapRng(rng)),
+            Some(&mut rng.unwrap_mut()),
             &self.inner,
             &self.prefix,
             &D::digest(msg),

src/pkcs1v15/signing_key.rs

@@ -1,5 +1,5 @@
 use super::{get_pss_signature_algo_id, sign_digest, Signature, VerifyingKey};
-use crate::{unwrap_rng::UnwrapRng, Result, RsaPrivateKey};
+use crate::{Result, RsaPrivateKey};
 use const_oid::AssociatedOid;
 use core::marker::PhantomData;
 use digest::{Digest, FixedOutputReset};
@@ -94,7 +94,7 @@ where
         msg: &[u8],
     ) -> signature::Result<Signature> {
         sign_digest::<_, D>(
-            &mut UnwrapRng(rng),
+            &mut rng.unwrap_mut(),
             true,
             &self.inner,
             &D::digest(msg),
@@ -115,7 +115,7 @@ where
         digest: D,
     ) -> signature::Result<Signature> {
         sign_digest::<_, D>(
-            &mut UnwrapRng(rng),
+            &mut rng.unwrap_mut(),
             true,
             &self.inner,
             &digest.finalize(),
@@ -136,7 +136,7 @@ where
         prehash: &[u8],
     ) -> signature::Result<Signature> {
         sign_digest::<_, D>(
-            &mut UnwrapRng(rng),
+            &mut rng.unwrap_mut(),
             true,
             &self.inner,
             prehash,

src/pss/blinded_signing_key.rs

@@ -1,6 +1,6 @@
 use super::{get_pss_signature_algo_id, sign_digest, Signature, VerifyingKey};
 use crate::encoding::verify_algorithm_id;
-use crate::{unwrap_rng::UnwrapRng, Result, RsaPrivateKey};
+use crate::{Result, RsaPrivateKey};
 use const_oid::AssociatedOid;
 use core::marker::PhantomData;
 use digest::{Digest, FixedOutputReset};
@@ -24,7 +24,7 @@ use {
 
 #[cfg(feature = "getrandom")]
 use {
-    rand_core::{OsRng, UnwrapErr},
+    rand_core::{OsRng, TryRngCore},
     signature::{hazmat::PrehashSigner, Signer},
 };
 
@@ -100,7 +100,7 @@ where
         digest: D,
     ) -> signature::Result<Signature> {
         sign_digest::<_, D>(
-            &mut UnwrapRng(rng),
+            &mut rng.unwrap_mut(),
             false,
             &self.inner,
             &digest.finalize(),
@@ -134,7 +134,7 @@ where
         prehash: &[u8],
     ) -> signature::Result<Signature> {
         sign_digest::<_, D>(
-            &mut UnwrapRng(rng),
+            &mut rng.unwrap_mut(),
             false,
             &self.inner,
             prehash,
@@ -151,7 +151,7 @@ where
     D: Digest + FixedOutputReset,
 {
     fn sign_prehash(&self, prehash: &[u8]) -> signature::Result<Signature> {
-        self.sign_prehash_with_rng(&mut UnwrapErr(OsRng), prehash)
+        self.sign_prehash_with_rng(&mut OsRng.unwrap_err(), prehash)
     }
 }
 
@@ -161,7 +161,7 @@ where
     D: Digest + FixedOutputReset,
 {
     fn try_sign(&self, msg: &[u8]) -> signature::Result<Signature> {
-        self.try_sign_with_rng(&mut UnwrapErr(OsRng), msg)
+        self.try_sign_with_rng(&mut OsRng.unwrap_err(), msg)
     }
 }