remove UnwrapRng

Author: baloo

Cargo.lock

@@ -38,3 +38,6 @@ crypto-bigint = { git = "https://github.com/RustCrypto/crypto-bigint.git" }
 ff = { git = "https://github.com/pinkforest/ff.git", branch = "bump-rand-core" }
 # https://github.com/zkcrypto/group/pull/56
 group = { git = "https://github.com/pinkforest/group.git", branch = "bump-rand-0.9" }
+
+# https://github.com/RustCrypto/traits/pull/1752
+signature = { git = "https://github.com/baloo/traits.git", branch = "baloo/signature/prehash-TryCryptoRng" }

Cargo.toml

@@ -59,9 +59,6 @@ extern crate alloc;
 
 mod recovery;
 
-#[cfg(feature = "signing")]
-mod unwrap_rng;
-
 #[cfg(feature = "der")]
 pub mod der;
 #[cfg(feature = "dev")]

ecdsa/src/lib.rs

@@ -4,12 +4,12 @@ use crate::{Error, Result};
 
 #[cfg(feature = "signing")]
 use {
-    crate::{hazmat::sign_prehashed_rfc6979, unwrap_rng::UnwrapRng, SigningKey},
+    crate::{hazmat::sign_prehashed_rfc6979, SigningKey},
     elliptic_curve::{subtle::CtOption, FieldBytes},
     signature::{
         digest::FixedOutput,
         hazmat::{PrehashSigner, RandomizedPrehashSigner},
-        rand_core::{CryptoRng, TryCryptoRng},
+        rand_core::TryCryptoRng,
         DigestSigner, RandomizedDigestSigner, Signer,
     },
 };
@@ -185,14 +185,14 @@ where
 {
     /// Sign the given message prehash, using the given rng for the RFC6979 Section 3.6 "additional
     /// data", returning a signature and recovery ID.
-    pub fn sign_prehash_recoverable_with_rng<R: CryptoRng>(
+    pub fn sign_prehash_recoverable_with_rng<R: TryCryptoRng>(
         &self,
         rng: &mut R,
         prehash: &[u8],
     ) -> Result<(Signature<C>, RecoveryId)> {
         let z = bits2field::<C>(prehash)?;
         let mut ad = FieldBytes::<C>::default();
-        rng.fill_bytes(&mut ad);
+        rng.try_fill_bytes(&mut ad).map_err(|_| Error::new())?;
         sign_prehashed_rfc6979::<C, C::Digest>(self.as_nonzero_scalar(), &z, &ad)
     }
 
@@ -237,7 +237,7 @@ where
     Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
     SignatureSize<C>: ArraySize,
 {
-    fn sign_prehash_with_rng<R: CryptoRng>(
+    fn sign_prehash_with_rng<R: TryCryptoRng>(
         &self,
         rng: &mut R,
         prehash: &[u8],
@@ -259,7 +259,7 @@ where
         rng: &mut R,
         msg_digest: D,
     ) -> Result<(Signature<C>, RecoveryId)> {
-        self.sign_prehash_with_rng(&mut UnwrapRng(rng), &msg_digest.finalize_fixed())
+        self.sign_prehash_with_rng(rng, &msg_digest.finalize_fixed())
     }
 }
 

ecdsa/src/recovery.rs

@@ -3,7 +3,6 @@
 use crate::{
     ecdsa_oid_for_digest,
     hazmat::{bits2field, sign_prehashed_rfc6979, DigestPrimitive},
-    unwrap_rng::UnwrapRng,
     EcdsaCurve, Error, Result, Signature, SignatureSize, SignatureWithOid,
 };
 use core::fmt::{self, Debug};
@@ -188,7 +187,7 @@ where
         rng: &mut R,
         msg_digest: D,
     ) -> Result<Signature<C>> {
-        self.sign_prehash_with_rng(&mut UnwrapRng(rng), &msg_digest.finalize_fixed())
+        self.sign_prehash_with_rng(rng, &msg_digest.finalize_fixed())
     }
 }
 
@@ -198,14 +197,14 @@ where
     Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
     SignatureSize<C>: ArraySize,
 {
-    fn sign_prehash_with_rng<R: CryptoRng>(
+    fn sign_prehash_with_rng<R: TryCryptoRng>(
         &self,
         rng: &mut R,
         prehash: &[u8],
     ) -> Result<Signature<C>> {
         let z = bits2field::<C>(prehash)?;
         let mut ad = FieldBytes::<C>::default();
-        rng.fill_bytes(&mut ad);
+        rng.try_fill_bytes(&mut ad).map_err(|_| Error::new())?;
         Ok(sign_prehashed_rfc6979::<C, C::Digest>(&self.secret_scalar, &z, &ad)?.0)
     }
 }
@@ -305,7 +304,7 @@ where
     der::MaxSize<C>: ArraySize,
     <FieldBytesSize<C> as Add>::Output: Add<der::MaxOverhead> + ArraySize,
 {
-    fn sign_prehash_with_rng<R: CryptoRng>(
+    fn sign_prehash_with_rng<R: TryCryptoRng>(
         &self,
         rng: &mut R,
         prehash: &[u8],