Fix dependency features & clippy lints

Author: sulami

Cargo.toml

@@ -23,7 +23,7 @@ rust-version = "1.73.0"
 base64 = "0.22"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-signature = "2.2.0"
+signature = { version = "2.2.0", features = ["std"] }
 
 # For PEM decoding
 pem = { version = "3", optional = true }
@@ -33,7 +33,7 @@ simple_asn1 = { version = "0.6", optional = true }
 aws-lc-rs = { version = "1.10.0", optional = true }
 
 # "rust_crypto" feature
-ed25519-dalek = { version = "2.1.1", optional = true }
+ed25519-dalek = { version = "2.1.1", optional = true, features = ["pkcs8"] }
 hmac = { version = "0.12.1", optional = true }
 p256 = { version = "0.13.2", optional = true, features = ["ecdsa"] }
 p384 = { version = "0.13.0", optional = true, features = ["ecdsa"] }

src/crypto/aws_lc/hmac.rs

@@ -47,7 +47,7 @@ impl Hs256Verifier {
 
 impl Verifier<Vec<u8>> for Hs256Verifier {
     fn verify(&self, msg: &[u8], signature: &Vec<u8>) -> std::result::Result<(), signature::Error> {
-        hmac::verify(&self.0, msg, &signature).map_err(|err| signature::Error::from_source(err))
+        hmac::verify(&self.0, msg, signature).map_err(signature::Error::from_source)
     }
 }
 
@@ -93,7 +93,7 @@ impl Hs384Verifier {
 
 impl Verifier<Vec<u8>> for Hs384Verifier {
     fn verify(&self, msg: &[u8], signature: &Vec<u8>) -> std::result::Result<(), signature::Error> {
-        hmac::verify(&self.0, msg, &signature).map_err(|err| signature::Error::from_source(err))
+        hmac::verify(&self.0, msg, signature).map_err(signature::Error::from_source)
     }
 }
 
@@ -139,7 +139,7 @@ impl Hs512Verifier {
 
 impl Verifier<Vec<u8>> for Hs512Verifier {
     fn verify(&self, msg: &[u8], signature: &Vec<u8>) -> std::result::Result<(), signature::Error> {
-        hmac::verify(&self.0, msg, &signature).map_err(|err| signature::Error::from_source(err))
+        hmac::verify(&self.0, msg, signature).map_err(signature::Error::from_source)
     }
 }
 

src/crypto/aws_lc/rsa.rs

@@ -17,13 +17,11 @@ fn try_sign_rsa(
     msg: &[u8],
 ) -> std::result::Result<Vec<u8>, signature::Error> {
     let key_pair = crypto_sig::RsaKeyPair::from_der(encoding_key.inner())
-        .map_err(|err| signature::Error::from_source(err))?;
+        .map_err(signature::Error::from_source)?;
 
     let mut signature = vec![0; key_pair.public_modulus_len()];
     let rng = rand::SystemRandom::new();
-    key_pair
-        .sign(algorithm, &rng, msg, &mut signature)
-        .map_err(|err| signature::Error::from_source(err))?;
+    key_pair.sign(algorithm, &rng, msg, &mut signature).map_err(signature::Error::from_source)?;
 
     Ok(signature)
 }
@@ -42,13 +40,11 @@ fn verify_rsa(
     match &decoding_key.kind {
         DecodingKeyKind::SecretOrDer(bytes) => {
             let public_key = crypto_sig::UnparsedPublicKey::new(algorithm, bytes);
-            public_key.verify(msg, signature).map_err(|err| signature::Error::from_source(err))?;
+            public_key.verify(msg, signature).map_err(signature::Error::from_source)?;
         }
         DecodingKeyKind::RsaModulusExponent { n, e } => {
             let public_key = crypto_sig::RsaPublicKeyComponents { n, e };
-            public_key
-                .verify(algorithm, msg, &signature)
-                .map_err(|err| signature::Error::from_source(err))?;
+            public_key.verify(algorithm, msg, signature).map_err(signature::Error::from_source)?;
         }
     };
 

src/crypto/rust_crypto/hmac.rs

@@ -62,7 +62,7 @@ impl Verifier<Vec<u8>> for Hs256Verifier {
         verifier.reset();
         verifier.update(msg);
 
-        verifier.verify_slice(signature).map_err(|e| signature::Error::from_source(e))
+        verifier.verify_slice(signature).map_err(signature::Error::from_source)
     }
 }
 
@@ -118,7 +118,7 @@ impl Verifier<Vec<u8>> for Hs384Verifier {
         verifier.reset();
         verifier.update(msg);
 
-        verifier.verify_slice(signature).map_err(|e| signature::Error::from_source(e))
+        verifier.verify_slice(signature).map_err(signature::Error::from_source)
     }
 }
 
@@ -174,7 +174,7 @@ impl Verifier<Vec<u8>> for Hs512Verifier {
         verifier.reset();
         verifier.update(msg);
 
-        verifier.verify_slice(signature).map_err(|e| signature::Error::from_source(e))
+        verifier.verify_slice(signature).map_err(signature::Error::from_source)
     }
 }
 

src/encoding.rs

@@ -164,13 +164,16 @@ pub fn _encode<T: Serialize>(
     let encoded_claims = b64_encode_part(claims)?;
     let message = [encoded_header, encoded_claims].join(".");
 
-    let signature = b64_encode(&signing_provider.sign(message.as_bytes()));
+    let signature = b64_encode(signing_provider.sign(message.as_bytes()));
 
     Ok([message, signature].join("."))
 }
 
 /// Return the correct [`JwtSigner`] based on the `algorithm`.
-pub(crate) fn jwt_signer_factory(algorithm: &Algorithm, key: &EncodingKey) -> Result<Box<dyn JwtSigner>> {
+pub(crate) fn jwt_signer_factory(
+    algorithm: &Algorithm,
+    key: &EncodingKey,
+) -> Result<Box<dyn JwtSigner>> {
     let jwt_signer = match algorithm {
         Algorithm::HS256 => Box::new(Hs256Signer::new(key)?) as Box<dyn JwtSigner>,
         Algorithm::HS384 => Box::new(Hs384Signer::new(key)?) as Box<dyn JwtSigner>,