ecdsa: Signer would only be implemented with hazmat

Author: baloo

ecdsa/src/der.rs

@@ -382,10 +382,10 @@ fn find_scalar_range(outer: &[u8], inner: &[u8]) -> Result<Range<usize>> {
     Ok(Range { start, end })
 }
 
-#[cfg(all(feature = "digest", feature = "hazmat"))]
+#[cfg(feature = "digest")]
 impl<C> signature::PrehashSignature for Signature<C>
 where
-    C: EcdsaCurve + crate::hazmat::DigestPrimitive,
+    C: EcdsaCurve + crate::DigestPrimitive,
     MaxSize<C>: ArraySize,
     <FieldBytesSize<C> as Add>::Output: Add<MaxOverhead> + ArraySize,
 {

ecdsa/src/hazmat.rs

@@ -42,27 +42,16 @@ use elliptic_curve::FieldBytesEncoding;
 #[cfg(any(feature = "arithmetic", feature = "digest"))]
 use crate::{Signature, elliptic_curve::array::ArraySize};
 
-/// Bind a preferred [`Digest`] algorithm to an elliptic curve type.
-///
-/// Generally there is a preferred variety of the SHA-2 family used with ECDSA
-/// for a particular elliptic curve.
-///
-/// This trait can be used to specify it, and with it receive a blanket impl of
-/// [`PrehashSignature`], used by [`signature_derive`][1]) for the [`Signature`]
-/// type for a particular elliptic curve.
-///
-/// [1]: https://github.com/RustCrypto/traits/tree/master/signature/derive
-#[cfg(feature = "digest")]
-pub trait DigestPrimitive: EcdsaCurve {
-    /// Preferred digest to use when computing ECDSA signatures for this
-    /// elliptic curve. This is typically a member of the SHA-2 family.
-    type Digest: BlockSizeUser + Digest + FixedOutput + FixedOutputReset;
-}
+#[deprecated(
+    since = "0.17.0",
+    note = "`DigestPrimitive` is no longer in `hazmat`, please use `ecdsa::DigestPrimitive` instead"
+)]
+pub use crate::DigestPrimitive;
 
 #[cfg(feature = "digest")]
 impl<C> PrehashSignature for Signature<C>
 where
-    C: DigestPrimitive,
+    C: crate::DigestPrimitive,
     <FieldBytesSize<C> as core::ops::Add>::Output: ArraySize,
 {
     type Digest = C::Digest;

ecdsa/src/lib.rs

@@ -102,8 +102,9 @@ use {
 
 #[cfg(feature = "digest")]
 use digest::{
-    Digest,
+    Digest, FixedOutput, FixedOutputReset,
     const_oid::{AssociatedOid, ObjectIdentifier},
+    core_api::BlockSizeUser,
 };
 
 #[cfg(feature = "pkcs8")]
@@ -770,3 +771,20 @@ const fn ecdsa_oid_for_digest(digest_oid: ObjectIdentifier) -> Option<ObjectIden
         _ => None,
     }
 }
+
+/// Bind a preferred [`Digest`] algorithm to an elliptic curve type.
+///
+/// Generally there is a preferred variety of the SHA-2 family used with ECDSA
+/// for a particular elliptic curve.
+///
+/// This trait can be used to specify it, and with it receive a blanket impl of
+/// [`PrehashSignature`], used by [`signature_derive`][1]) for the [`Signature`]
+/// type for a particular elliptic curve.
+///
+/// [1]: https://github.com/RustCrypto/traits/tree/master/signature/derive
+#[cfg(feature = "digest")]
+pub trait DigestPrimitive: EcdsaCurve {
+    /// Preferred digest to use when computing ECDSA signatures for this
+    /// elliptic curve. This is typically a member of the SHA-2 family.
+    type Digest: BlockSizeUser + Digest + FixedOutput + FixedOutputReset;
+}

ecdsa/src/recovery.rs

@@ -28,10 +28,7 @@ use {
 
 #[cfg(any(feature = "signing", feature = "verifying"))]
 use {
-    crate::{
-        EcdsaCurve, Signature, SignatureSize,
-        hazmat::{DigestPrimitive, bits2field},
-    },
+    crate::{DigestPrimitive, EcdsaCurve, Signature, SignatureSize, hazmat::bits2field},
     elliptic_curve::{CurveArithmetic, Scalar, array::ArraySize, ops::Invert},
     signature::digest::Digest,
 };

ecdsa/src/signing.rs

@@ -1,8 +1,9 @@
 //! ECDSA signing: producing signatures using a [`SigningKey`].
 
 use crate::{
-    EcdsaCurve, Error, Result, Signature, SignatureSize, SignatureWithOid, ecdsa_oid_for_digest,
-    hazmat::{DigestPrimitive, bits2field, sign_prehashed_rfc6979},
+    DigestPrimitive, EcdsaCurve, Error, Result, Signature, SignatureSize, SignatureWithOid,
+    ecdsa_oid_for_digest,
+    hazmat::{bits2field, sign_prehashed_rfc6979},
 };
 use core::fmt::{self, Debug};
 use digest::{Digest, FixedOutput, const_oid::AssociatedOid};

ecdsa/src/verifying.rs

@@ -1,8 +1,8 @@
 //! ECDSA verifying: checking signatures are authentic using a [`VerifyingKey`].
 
 use crate::{
-    EcdsaCurve, Error, Result, Signature, SignatureSize,
-    hazmat::{self, DigestPrimitive, bits2field},
+    DigestPrimitive, EcdsaCurve, Error, Result, Signature, SignatureSize,
+    hazmat::{self, bits2field},
 };
 use core::{cmp::Ordering, fmt::Debug};
 use elliptic_curve::{