From a7dfb09a29e10a99c0de8fa0a7a0eaf126e0b1ca Mon Sep 17 00:00:00 2001
From: Tony Arcieri <bascule@gmail.com>
Date: Fri, 6 Jan 2023 14:10:27 -0700
Subject: [PATCH] Revert "signature: use `R: CryptoRngCore + ?Sized` (#1167)"

This reverts commit b12237e540df00cdd2949cf8f3d996fb1d766a1c.

As further discussed in #1148, passing a trait object to
`&mut impl CryptoRngCore` is possible by mutably borrowing it, and
upstream changes to `CryptoRng` should eliminate the requirement for
the `?Sized` bound.
---
 signature/src/hazmat.rs |  4 ++--
 signature/src/signer.rs | 17 +++++------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/signature/src/hazmat.rs b/signature/src/hazmat.rs
index c7b188efd..3233033c0 100644
--- a/signature/src/hazmat.rs
+++ b/signature/src/hazmat.rs
@@ -48,9 +48,9 @@ pub trait RandomizedPrehashSigner<S> {
     ///
     /// Allowed lengths are algorithm-dependent and up to a particular
     /// implementation to decide.
-    fn sign_prehash_with_rng<R: CryptoRngCore + ?Sized>(
+    fn sign_prehash_with_rng(
         &self,
-        rng: &mut R,
+        rng: &mut impl CryptoRngCore,
         prehash: &[u8],
     ) -> Result<S, Error>;
 }
diff --git a/signature/src/signer.rs b/signature/src/signer.rs
index de77f08c0..be3de2ec5 100644
--- a/signature/src/signer.rs
+++ b/signature/src/signer.rs
@@ -87,7 +87,7 @@ pub trait DigestSigner<D: Digest, S> {
 #[cfg_attr(docsrs, doc(cfg(feature = "rand-preview")))]
 pub trait RandomizedSigner<S> {
     /// Sign the given message and return a digital signature
-    fn sign_with_rng<R: CryptoRngCore + ?Sized>(&self, rng: &mut R, msg: &[u8]) -> S {
+    fn sign_with_rng(&self, rng: &mut impl CryptoRngCore, msg: &[u8]) -> S {
         self.try_sign_with_rng(rng, msg)
             .expect("signature operation failed")
     }
@@ -97,11 +97,7 @@ pub trait RandomizedSigner<S> {
     ///
     /// The main intended use case for signing errors is when communicating
     /// with external signers, e.g. cloud KMS, HSMs, or other hardware tokens.
-    fn try_sign_with_rng<R: CryptoRngCore + ?Sized>(
-        &self,
-        rng: &mut R,
-        msg: &[u8],
-    ) -> Result<S, Error>;
+    fn try_sign_with_rng(&self, rng: &mut impl CryptoRngCore, msg: &[u8]) -> Result<S, Error>;
 }
 
 /// Combination of [`DigestSigner`] and [`RandomizedSigner`] with support for
@@ -113,16 +109,13 @@ pub trait RandomizedDigestSigner<D: Digest, S> {
     /// Sign the given prehashed message `Digest`, returning a signature.
     ///
     /// Panics in the event of a signing error.
-    fn sign_digest_with_rng<R: CryptoRngCore + ?Sized>(&self, rng: &mut R, digest: D) -> S {
+    fn sign_digest_with_rng(&self, rng: &mut impl CryptoRngCore, digest: D) -> S {
         self.try_sign_digest_with_rng(rng, digest)
             .expect("signature operation failed")
     }
 
     /// Attempt to sign the given prehashed message `Digest`, returning a
     /// digital signature on success, or an error if something went wrong.
-    fn try_sign_digest_with_rng<R: CryptoRngCore + ?Sized>(
-        &self,
-        rng: &mut R,
-        digest: D,
-    ) -> Result<S, Error>;
+    fn try_sign_digest_with_rng(&self, rng: &mut impl CryptoRngCore, digest: D)
+        -> Result<S, Error>;
 }