ecdsa: use blanket impl from signature 3

Author: baloo

Cargo.lock

@@ -34,3 +34,4 @@ slh-dsa         = { path = "./slh-dsa" }
 # https://github.com/RustCrypto/traits/pull/1774
 # https://github.com/RustCrypto/traits/pull/1822
 elliptic-curve = { git = "https://github.com/RustCrypto/traits.git" }
+signature      = { git = "https://github.com/RustCrypto/traits.git", branch = "signature/blanket-signature-for-digestsignature-impl" }

Cargo.toml

@@ -18,7 +18,7 @@ rust-version = "1.85"
 
 [dependencies]
 elliptic-curve = { version = "0.14.0-rc.1", default-features = false, features = ["sec1"] }
-signature = { version = "=2.3.0-pre.7", default-features = false, features = ["rand_core"] }
+signature = { version = "=3.0.0-pre", default-features = false, features = ["rand_core"] }
 
 # optional dependencies
 der = { version = "0.8.0-rc.1", optional = true }

ecdsa/Cargo.toml

@@ -7,7 +7,7 @@ use {
     crate::{SigningKey, hazmat::sign_prehashed_rfc6979},
     elliptic_curve::{FieldBytes, subtle::CtOption},
     signature::{
-        DigestSigner, RandomizedDigestSigner, Signer,
+        DigestSigner, RandomizedDigestSigner,
         digest::FixedOutput,
         hazmat::{PrehashSigner, RandomizedPrehashSigner},
         rand_core::TryCryptoRng,
@@ -275,18 +275,6 @@ where
     }
 }
 
-#[cfg(feature = "signing")]
-impl<C> Signer<(Signature<C>, RecoveryId)> for SigningKey<C>
-where
-    C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
-    Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
-    SignatureSize<C>: ArraySize,
-{
-    fn try_sign(&self, msg: &[u8]) -> Result<(Signature<C>, RecoveryId)> {
-        self.sign_recoverable(msg)
-    }
-}
-
 #[cfg(feature = "verifying")]
 impl<C> VerifyingKey<C>
 where

ecdsa/src/recovery.rs

@@ -15,7 +15,7 @@ use elliptic_curve::{
     zeroize::{Zeroize, ZeroizeOnDrop},
 };
 use signature::{
-    DigestSigner, RandomizedDigestSigner, RandomizedSigner, Signer,
+    DigestSigner, RandomizedDigestSigner, Signer,
     hazmat::{PrehashSigner, RandomizedPrehashSigner},
     rand_core::{CryptoRng, TryCryptoRng},
 };
@@ -165,21 +165,6 @@ where
     }
 }
 
-/// Sign message using a deterministic ephemeral scalar (`k`)
-/// computed using the algorithm described in [RFC6979 § 3.2].
-///
-/// [RFC6979 § 3.2]: https://tools.ietf.org/html/rfc6979#section-3
-impl<C> Signer<Signature<C>> for SigningKey<C>
-where
-    C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
-    Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
-    SignatureSize<C>: ArraySize,
-{
-    fn try_sign(&self, msg: &[u8]) -> Result<Signature<C>> {
-        self.try_sign_digest(C::Digest::new_with_prefix(msg))
-    }
-}
-
 impl<C, D> RandomizedDigestSigner<D, Signature<C>> for SigningKey<C>
 where
     C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
@@ -214,22 +199,6 @@ where
     }
 }
 
-impl<C> RandomizedSigner<Signature<C>> for SigningKey<C>
-where
-    Self: RandomizedDigestSigner<C::Digest, Signature<C>>,
-    C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
-    Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
-    SignatureSize<C>: ArraySize,
-{
-    fn try_sign_with_rng<R: TryCryptoRng + ?Sized>(
-        &self,
-        rng: &mut R,
-        msg: &[u8],
-    ) -> Result<Signature<C>> {
-        self.try_sign_digest_with_rng(rng, C::Digest::new_with_prefix(msg))
-    }
-}
-
 impl<C, D> DigestSigner<D, SignatureWithOid<C>> for SigningKey<C>
 where
     C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
@@ -270,40 +239,6 @@ where
     }
 }
 
-#[cfg(feature = "der")]
-impl<C> Signer<der::Signature<C>> for SigningKey<C>
-where
-    C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
-    Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
-    SignatureSize<C>: ArraySize,
-    der::MaxSize<C>: ArraySize,
-    <FieldBytesSize<C> as Add>::Output: Add<der::MaxOverhead> + ArraySize,
-{
-    fn try_sign(&self, msg: &[u8]) -> Result<der::Signature<C>> {
-        Signer::<Signature<C>>::try_sign(self, msg).map(Into::into)
-    }
-}
-
-#[cfg(feature = "der")]
-impl<C, D> RandomizedDigestSigner<D, der::Signature<C>> for SigningKey<C>
-where
-    C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
-    D: Digest + FixedOutput,
-    Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
-    SignatureSize<C>: ArraySize,
-    der::MaxSize<C>: ArraySize,
-    <FieldBytesSize<C> as Add>::Output: Add<der::MaxOverhead> + ArraySize,
-{
-    fn try_sign_digest_with_rng<R: TryCryptoRng + ?Sized>(
-        &self,
-        rng: &mut R,
-        msg_digest: D,
-    ) -> Result<der::Signature<C>> {
-        RandomizedDigestSigner::<D, Signature<C>>::try_sign_digest_with_rng(self, rng, msg_digest)
-            .map(Into::into)
-    }
-}
-
 #[cfg(feature = "der")]
 impl<C> RandomizedPrehashSigner<der::Signature<C>> for SigningKey<C>
 where
@@ -323,24 +258,6 @@ where
     }
 }
 
-#[cfg(feature = "der")]
-impl<C> RandomizedSigner<der::Signature<C>> for SigningKey<C>
-where
-    C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
-    Scalar<C>: Invert<Output = CtOption<Scalar<C>>>,
-    SignatureSize<C>: ArraySize,
-    der::MaxSize<C>: ArraySize,
-    <FieldBytesSize<C> as Add>::Output: Add<der::MaxOverhead> + ArraySize,
-{
-    fn try_sign_with_rng<R: TryCryptoRng + ?Sized>(
-        &self,
-        rng: &mut R,
-        msg: &[u8],
-    ) -> Result<der::Signature<C>> {
-        RandomizedSigner::<Signature<C>>::try_sign_with_rng(self, rng, msg).map(Into::into)
-    }
-}
-
 //
 // Other trait impls
 //

ecdsa/src/signing.rs

@@ -172,16 +172,6 @@ where
     }
 }
 
-impl<C> Verifier<Signature<C>> for VerifyingKey<C>
-where
-    C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
-    SignatureSize<C>: ArraySize,
-{
-    fn verify(&self, msg: &[u8], signature: &Signature<C>) -> Result<()> {
-        self.verify_digest(C::Digest::new_with_prefix(msg), signature)
-    }
-}
-
 #[cfg(feature = "sha2")]
 impl<C> Verifier<SignatureWithOid<C>> for VerifyingKey<C>
 where
@@ -228,20 +218,6 @@ where
     }
 }
 
-#[cfg(feature = "der")]
-impl<C> Verifier<der::Signature<C>> for VerifyingKey<C>
-where
-    C: EcdsaCurve + CurveArithmetic + DigestPrimitive,
-    SignatureSize<C>: ArraySize,
-    der::MaxSize<C>: ArraySize,
-    <FieldBytesSize<C> as Add>::Output: Add<der::MaxOverhead> + ArraySize,
-{
-    fn verify(&self, msg: &[u8], signature: &der::Signature<C>) -> Result<()> {
-        let signature = Signature::<C>::try_from(signature.clone())?;
-        Verifier::<Signature<C>>::verify(self, msg, &signature)
-    }
-}
-
 //
 // Other trait impls
 //

ecdsa/src/verifying.rs

@@ -18,8 +18,8 @@ edition = "2024"
 rust-version = "1.85"
 
 [dependencies]
-# TODO(tarcieri): relax requirement back to `2` before next release
-signature = { version = "=2.3.0-pre.7", default-features = false }
+# TODO(tarcieri): relax requirement back to `3` before next release
+signature = { version = "=3.0.0-pre", default-features = false }
 
 # optional dependencies
 pkcs8 = { version = "0.11.0-rc.2", optional = true }

ed25519/Cargo.toml

@@ -18,8 +18,8 @@ keywords = ["crypto", "curve448", "ecc", "signature", "signing"]
 rust-version = "1.85"
 
 [dependencies]
-# TODO(tarcieri): relax requirement back to `2` before next release
-signature = { version = "=2.3.0-pre.7", default-features = false }
+# TODO(tarcieri): relax requirement back to `3` before next release
+signature = { version = "=3.0.0-pre", default-features = false }
 
 # optional dependencies
 pkcs8 = { version = "0.11.0-rc.1", optional = true }

ed448/Cargo.toml

@@ -18,7 +18,7 @@ rand = "0.9.0"
 sha2 = "=0.11.0-pre.5"
 static_assertions = "1.1.0"
 rand_core = "0.9.0"
-signature = { version = "=2.3.0-pre.7", features = ["digest", "std", "rand_core"] }
+signature = { version = "=3.0.0-pre", features = ["digest", "std", "rand_core"] }
 typenum = { version = "1.17.0", features = ["const-generics"] }
 zeroize = "1.8.1"
 

lms/Cargo.toml

@@ -21,7 +21,7 @@ typenum = { version = "1.17.0", features = ["const-generics"] }
 sha3 = { version = "=0.11.0-pre.5", default-features = false }
 zerocopy = { version = "0.7.34", features = ["derive"] }
 rand_core = { version = "0.9.2" }
-signature = { version = "=2.3.0-pre.7", features = ["rand_core"] }
+signature = { version = "=3.0.0-pre", features = ["rand_core"] }
 hmac = "=0.13.0-pre.5"
 sha2 = { version = "=0.11.0-pre.5", default-features = false }
 digest = "=0.11.0-pre.10"