remove cfg features

Signed-off-by: Ryan Tate <[email protected]>
spruceid · Aug 28, 2024 · 033fd5e · 033fd5e
1 parent d0c7439
commit 033fd5e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 16 deletions.
diff --git a/src/core/authorization_request/parameters.rs b/src/core/authorization_request/parameters.rs
@@ -223,11 +223,11 @@ impl std::fmt::Display for Nonce {
 }
 
 impl Nonce {
-    #[cfg(feature = "rand")]
-    pub fn random(rng: &mut impl rand::Rng) -> Self {
-        use rand::distributions::Alphanumeric;
+    /// Crate a new `Nonce` with a random value of the given length.
+    pub fn random(rng: &mut impl rand::Rng, length: usize) -> Self {
+        use rand::distributions::{Alphanumeric, DistString};
 
-        Self((0..16).map(|_| rng.sample(Alphanumeric) as char).collect())
+        Self(Alphanumeric.sample_string(rng, length))
     }
 }
 

diff --git a/src/core/authorization_request/verification/verifier.rs b/src/core/authorization_request/verification/verifier.rs
@@ -1,7 +1,5 @@
 use anyhow::Result;
-#[cfg(feature = "p256")]
 use anyhow::{bail, Error};
-#[cfg(feature = "p256")]
 use p256::ecdsa::signature::Verifier as _;
 use x509_cert::spki::SubjectPublicKeyInfoRef;
 
@@ -15,11 +13,9 @@ pub trait Verifier: Sized {
     fn verify(&self, payload: &[u8], signature: &[u8]) -> Result<()>;
 }
 
-#[cfg(feature = "p256")]
 #[derive(Debug, Clone)]
 pub struct P256Verifier(p256::ecdsa::VerifyingKey);
 
-#[cfg(feature = "p256")]
 impl Verifier for P256Verifier {
     fn from_spki(spki: SubjectPublicKeyInfoRef<'_>, algorithm: String) -> Result<Self> {
         if algorithm != "ES256" {

diff --git a/src/verifier/request_signer.rs b/src/verifier/request_signer.rs
@@ -1,11 +1,7 @@
-#[cfg(feature = "p256")]
 use anyhow::Result;
 use async_trait::async_trait;
-#[cfg(feature = "p256")]
 use p256::ecdsa::{signature::Signer, Signature, SigningKey};
-#[cfg(feature = "p256")]
 use ssi_claims::jws::{JWSSigner, JWSSignerInfo};
-#[cfg(feature = "p256")]
 use ssi_jwk::Algorithm;
 
 use ssi_jwk::JWK;
@@ -33,14 +29,12 @@ pub trait RequestSigner: Debug {
     }
 }
 
-#[cfg(feature = "p256")]
 #[derive(Debug)]
 pub struct P256Signer {
     key: SigningKey,
     jwk: JWK,
 }
 
-#[cfg(feature = "p256")]
 impl P256Signer {
     pub fn new(key: SigningKey) -> Result<Self> {
         let pk: p256::PublicKey = key.verifying_key().into();
@@ -53,7 +47,6 @@ impl P256Signer {
     }
 }
 
-#[cfg(feature = "p256")]
 #[async_trait]
 impl RequestSigner for P256Signer {
     type Error = anyhow::Error;
@@ -77,7 +70,6 @@ impl RequestSigner for P256Signer {
     }
 }
 
-#[cfg(feature = "p256")]
 impl JWSSigner for P256Signer {
     async fn fetch_info(&self) -> std::result::Result<JWSSignerInfo, ssi_claims::SignatureError> {
         let algorithm = self.jwk.algorithm.unwrap_or(Algorithm::ES256);