Clean up crate features

Author: daxpedda

Cargo.lock

@@ -24,6 +24,7 @@ zeroize = { version = "1.5", default-features = false }
 # optional dependencies
 der = { version = "0.8.0-rc.8", optional = true }
 digest = { version = "0.11.0-rc.1", optional = true, default-features = false, features = ["oid"] }
+hmac = { version = "0.13.0-rc.1", default-features = false, optional = true }
 rfc6979 = { version = "0.5.0-rc.1", optional = true }
 serdect = { version = "0.4", optional = true, default-features = false, features = ["alloc"] }
 sha2 = { version = "0.11.0-rc.2", optional = true, default-features = false, features = ["oid"] }
@@ -39,14 +40,15 @@ default = ["digest"]
 alloc = ["elliptic-curve/alloc", "signature/alloc", "spki/alloc"]
 std = ["alloc", "elliptic-curve/std"]
 
-arithmetic = ["elliptic-curve/arithmetic"]
+arithmetic = ["dep:hmac", "dep:rfc6979", "elliptic-curve/arithmetic"]
+algorithm = ["dep:rfc6979", "arithmetic", "digest", "hazmat"]
 dev = ["arithmetic", "digest", "elliptic-curve/dev", "hazmat"]
-digest = ["dep:digest", "elliptic-curve/digest", "signature/digest", "rfc6979"]
+der = ["dep:der"]
+digest = ["dep:digest", "dep:hmac", "elliptic-curve/digest", "signature/digest"]
 hazmat = []
-pkcs8 = ["digest", "elliptic-curve/pkcs8", "der"]
+pkcs8 = ["dep:der", "digest", "elliptic-curve/pkcs8"]
 pem = ["elliptic-curve/pem", "pkcs8"]
-serde = ["elliptic-curve/serde", "pkcs8", "serdect"]
-signature = ["arithmetic", "digest", "hazmat", "rfc6979"]
+serde = ["dep:serdect", "elliptic-curve/serde", "pkcs8"]
 
 [package.metadata.docs.rs]
 all-features = true

ecdsa/Cargo.toml

@@ -34,7 +34,7 @@ use crate::{
 };
 
 #[cfg(any(feature = "arithmetic", feature = "digest"))]
-use rfc6979::hmac::EagerHash;
+use hmac::EagerHash;
 
 /// Bind a preferred [`Digest`] algorithm to an elliptic curve type.
 ///

ecdsa/src/hazmat.rs

@@ -65,9 +65,9 @@ pub mod der;
 pub mod dev;
 #[cfg(feature = "hazmat")]
 pub mod hazmat;
-#[cfg(feature = "signature")]
+#[cfg(feature = "algorithm")]
 mod signing;
-#[cfg(feature = "signature")]
+#[cfg(feature = "algorithm")]
 mod verifying;
 
 pub use crate::recovery::RecoveryId;
@@ -79,9 +79,9 @@ pub use elliptic_curve::{self, PrimeCurve, sec1::EncodedPoint};
 pub use signature::{self, Error, Result, SignatureEncoding};
 use zeroize::Zeroize;
 
-#[cfg(feature = "signature")]
+#[cfg(feature = "algorithm")]
 pub use crate::signing::SigningKey;
-#[cfg(feature = "signature")]
+#[cfg(feature = "algorithm")]
 pub use crate::verifying::VerifyingKey;
 
 use core::{fmt, ops::Add};

ecdsa/src/lib.rs

@@ -2,7 +2,7 @@
 
 use crate::{Error, Result};
 
-#[cfg(feature = "signature")]
+#[cfg(feature = "algorithm")]
 use {
     crate::{
         EcdsaCurve, Signature, SignatureSize, SigningKey, VerifyingKey,
@@ -80,7 +80,7 @@ impl RecoveryId {
     }
 }
 
-#[cfg(feature = "signature")]
+#[cfg(feature = "algorithm")]
 impl RecoveryId {
     /// Given a public key, message, and signature, use trial recovery
     /// to determine if a suitable recovery ID exists, or return an error
@@ -167,7 +167,7 @@ impl From<RecoveryId> for u8 {
     }
 }
 
-#[cfg(feature = "signature")]
+#[cfg(feature = "algorithm")]
 impl<C> SigningKey<C>
 where
     C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
@@ -216,7 +216,7 @@ where
     }
 }
 
-#[cfg(feature = "signature")]
+#[cfg(feature = "algorithm")]
 impl<C, D> DigestSigner<D, (Signature<C>, RecoveryId)> for SigningKey<C>
 where
     C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
@@ -234,7 +234,7 @@ where
     }
 }
 
-#[cfg(feature = "signature")]
+#[cfg(feature = "algorithm")]
 impl<C> RandomizedPrehashSigner<(Signature<C>, RecoveryId)> for SigningKey<C>
 where
     C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
@@ -250,7 +250,7 @@ where
     }
 }
 
-#[cfg(feature = "signature")]
+#[cfg(feature = "algorithm")]
 impl<C, D> RandomizedDigestSigner<D, (Signature<C>, RecoveryId)> for SigningKey<C>
 where
     C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
@@ -269,7 +269,7 @@ where
     }
 }
 
-#[cfg(feature = "signature")]
+#[cfg(feature = "algorithm")]
 impl<C> PrehashSigner<(Signature<C>, RecoveryId)> for SigningKey<C>
 where
     C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
@@ -281,7 +281,7 @@ where
     }
 }
 
-#[cfg(feature = "signature")]
+#[cfg(feature = "algorithm")]
 impl<C> Signer<(Signature<C>, RecoveryId)> for SigningKey<C>
 where
     C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
@@ -293,7 +293,7 @@ where
     }
 }
 
-#[cfg(feature = "signature")]
+#[cfg(feature = "algorithm")]
 impl<C> MultipartSigner<(Signature<C>, RecoveryId)> for SigningKey<C>
 where
     C: EcdsaCurve + CurveArithmetic + DigestAlgorithm,
@@ -307,7 +307,7 @@ where
     }
 }
 
-#[cfg(feature = "signature")]
+#[cfg(feature = "algorithm")]
 impl<C> VerifyingKey<C>
 where
     C: EcdsaCurve + CurveArithmetic,

ecdsa/src/recovery.rs

@@ -23,11 +23,14 @@ use signature::{
 };
 
 #[cfg(feature = "der")]
-use {crate::der, core::ops::Add, elliptic_curve::FieldBytesSize};
+use {crate::der, core::ops::Add};
 
 #[cfg(feature = "pem")]
 use {core::str::FromStr, elliptic_curve::pkcs8::DecodePrivateKey};
 
+#[cfg(any(feature = "der", feature = "pem", feature = "pkcs8"))]
+use elliptic_curve::FieldBytesSize;
+
 #[cfg(feature = "pkcs8")]
 use crate::elliptic_curve::{
     AffinePoint,
@@ -39,7 +42,7 @@ use crate::elliptic_curve::{
     sec1::{self, FromEncodedPoint, ToEncodedPoint},
 };
 
-#[cfg(feature = "signature")]
+#[cfg(feature = "algorithm")]
 use {crate::VerifyingKey, elliptic_curve::PublicKey, signature::KeypairRef};
 
 #[cfg(all(feature = "alloc", feature = "pkcs8"))]
@@ -72,7 +75,7 @@ where
     secret_scalar: NonZeroScalar<C>,
 
     /// Verifying key which corresponds to this signing key.
-    #[cfg(feature = "signature")]
+    #[cfg(feature = "algorithm")]
     verifying_key: VerifyingKey<C>,
 }
 
@@ -125,7 +128,7 @@ where
     }
 
     /// Get the [`VerifyingKey`] which corresponds to this [`SigningKey`].
-    #[cfg(feature = "signature")]
+    #[cfg(feature = "algorithm")]
     pub fn verifying_key(&self) -> &VerifyingKey<C> {
         &self.verifying_key
     }
@@ -441,7 +444,7 @@ where
 // Other trait impls
 //
 
-#[cfg(feature = "signature")]
+#[cfg(feature = "algorithm")]
 impl<C> AsRef<VerifyingKey<C>> for SigningKey<C>
 where
     C: EcdsaCurve + CurveArithmetic,
@@ -512,12 +515,12 @@ where
     SignatureSize<C>: ArraySize,
 {
     fn from(secret_scalar: NonZeroScalar<C>) -> Self {
-        #[cfg(feature = "signature")]
+        #[cfg(feature = "algorithm")]
         let public_key = PublicKey::from_secret_scalar(&secret_scalar);
 
         Self {
             secret_scalar,
-            #[cfg(feature = "signature")]
+            #[cfg(feature = "algorithm")]
             verifying_key: public_key.into(),
         }
     }
@@ -588,7 +591,7 @@ where
 {
 }
 
-#[cfg(feature = "signature")]
+#[cfg(feature = "algorithm")]
 impl<C> From<SigningKey<C>> for VerifyingKey<C>
 where
     C: EcdsaCurve + CurveArithmetic,
@@ -600,7 +603,7 @@ where
     }
 }
 
-#[cfg(feature = "signature")]
+#[cfg(feature = "algorithm")]
 impl<C> From<&SigningKey<C>> for VerifyingKey<C>
 where
     C: EcdsaCurve + CurveArithmetic,
@@ -612,7 +615,7 @@ where
     }
 }
 
-#[cfg(feature = "signature")]
+#[cfg(feature = "algorithm")]
 impl<C> KeypairRef for SigningKey<C>
 where
     C: EcdsaCurve + CurveArithmetic,