From a6ea8c2c1a4bb6ad4778b6320f6c18a1ab4545f4 Mon Sep 17 00:00:00 2001
From: Vincent Prouillet <balthek@gmail.com>
Date: Wed, 6 Nov 2019 18:41:51 +0000
Subject: [PATCH] clippy + fmt

---
 src/crypto.rs      |  8 ++++----
 src/pem_decoder.rs | 19 ++++++++++---------
 src/pem_encoder.rs | 10 +++++-----
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/crypto.rs b/src/crypto.rs
index 3556fb8..804f082 100644
--- a/src/crypto.rs
+++ b/src/crypto.rs
@@ -10,7 +10,7 @@ use crate::keys::Key;
 fn sign_hmac(alg: hmac::Algorithm, key: Key, signing_input: &str) -> Result<String> {
     let signing_key = match key {
         Key::Hmac(bytes) => hmac::Key::new(alg, bytes),
-        _ => return Err(ErrorKind::InvalidKeyFormat)?,
+        _ => return Err(ErrorKind::InvalidKeyFormat.into()),
     };
     let digest = hmac::sign(&signing_key, signing_input.as_bytes());
 
@@ -49,7 +49,7 @@ fn sign_rsa(
             signature::RsaKeyPair::from_pkcs8(bytes).map_err(|_| ErrorKind::InvalidRsaKey)?
         }
         _ => {
-            return Err(ErrorKind::InvalidKeyFormat)?;
+            return Err(ErrorKind::InvalidKeyFormat.into());
         }
     };
 
@@ -112,7 +112,7 @@ fn verify_ring_es(
     let bytes = match key {
         Key::Pkcs8(bytes) => bytes,
         _ => {
-            return Err(ErrorKind::InvalidKeyFormat)?;
+            return Err(ErrorKind::InvalidKeyFormat.into());
         }
     };
     verify_ring(alg, signature, signing_input, bytes)
@@ -135,7 +135,7 @@ fn verify_ring_rsa(
 
             Ok(res.is_ok())
         }
-        _ => Err(ErrorKind::InvalidKeyFormat)?,
+        _ => Err(ErrorKind::InvalidKeyFormat.into()),
     }
 }
 
diff --git a/src/pem_decoder.rs b/src/pem_decoder.rs
index 0f08440..c42b042 100644
--- a/src/pem_decoder.rs
+++ b/src/pem_decoder.rs
@@ -57,7 +57,7 @@ impl PemEncodedKey {
                 let pem_contents = content.contents;
                 let asn1_content = match simple_asn1::from_der(pem_contents.as_slice()) {
                     Ok(asn1) => asn1,
-                    Err(_) => return Err(ErrorKind::InvalidKeyFormat)?,
+                    Err(_) => return Err(ErrorKind::InvalidKeyFormat.into()),
                 };
 
                 match content.tag.as_ref() {
@@ -106,14 +106,14 @@ impl PemEncodedKey {
                                 standard: Standard::Pkcs8,
                             })
                         }
-                        None => return Err(ErrorKind::InvalidKeyFormat)?,
+                        None => Err(ErrorKind::InvalidKeyFormat.into()),
                     },
 
                     // Unknown/unsupported type
-                    _ => return Err(ErrorKind::InvalidKeyFormat)?,
+                    _ => Err(ErrorKind::InvalidKeyFormat.into()),
                 }
             }
-            Err(_) => return Err(ErrorKind::InvalidKeyFormat)?,
+            Err(_) => Err(ErrorKind::InvalidKeyFormat.into()),
         }
     }
 
@@ -139,7 +139,7 @@ impl PemEncodedKey {
 // And the DER contents of an RSA key
 // Though PKCS#11 keys shouldn't have anything else.
 // It will get confusing with certificates.
-fn extract_first_bitstring(asn1: &Vec<simple_asn1::ASN1Block>) -> Result<&[u8]> {
+fn extract_first_bitstring(asn1: &[simple_asn1::ASN1Block]) -> Result<&[u8]> {
     for asn1_entry in asn1.iter() {
         match asn1_entry {
             simple_asn1::ASN1Block::Sequence(_, entries) => {
@@ -156,15 +156,16 @@ fn extract_first_bitstring(asn1: &Vec<simple_asn1::ASN1Block>) -> Result<&[u8]>
             _ => (),
         }
     }
-    Err(ErrorKind::InvalidEcdsaKey)?
+
+    Err(ErrorKind::InvalidEcdsaKey.into())
 }
 
 /// Find whether this is EC or RSA
-fn classify_pem(asn1: &Vec<simple_asn1::ASN1Block>) -> Option<Classification> {
+fn classify_pem(asn1: &[simple_asn1::ASN1Block]) -> Option<Classification> {
     // These should be constant but the macro requires
     // #![feature(const_vec_new)]
-    let ec_public_key_oid = simple_asn1::oid!(1, 2, 840, 10045, 2, 1);
-    let rsa_public_key_oid = simple_asn1::oid!(1, 2, 840, 113549, 1, 1, 1);
+    let ec_public_key_oid = simple_asn1::oid!(1, 2, 840, 10_045, 2, 1);
+    let rsa_public_key_oid = simple_asn1::oid!(1, 2, 840, 113_549, 1, 1, 1);
 
     for asn1_entry in asn1.iter() {
         match asn1_entry {
diff --git a/src/pem_encoder.rs b/src/pem_encoder.rs
index 101cef7..d719fc1 100644
--- a/src/pem_encoder.rs
+++ b/src/pem_encoder.rs
@@ -16,7 +16,7 @@ pub fn encode_rsa_public_pkcs1_pem(modulus: &[u8], exponent: &[u8]) -> Result<St
 pub fn encode_rsa_public_pkcs1_der(modulus: &[u8], exponent: &[u8]) -> Result<Vec<u8>> {
     match simple_asn1::to_der(&encode_rsa_public_pksc1_asn1(modulus, exponent)) {
         Ok(bytes) => Ok(bytes),
-        Err(_) => return Err(ErrorKind::InvalidRsaKey)?,
+        Err(_) => Err(ErrorKind::InvalidRsaKey.into()),
     }
 }
 
@@ -30,7 +30,7 @@ pub fn encode_rsa_public_pkcs8_pem(modulus: &[u8], exponent: &[u8]) -> Result<St
 pub fn encode_rsa_public_pkcs8_der(modulus: &[u8], exponent: &[u8]) -> Result<Vec<u8>> {
     match simple_asn1::to_der(&encode_rsa_public_pksc8_asn1(modulus, exponent)?) {
         Ok(bytes) => Ok(bytes),
-        Err(_) => return Err(ErrorKind::InvalidRsaKey)?,
+        Err(_) => Err(ErrorKind::InvalidRsaKey.into()),
     }
 }
 
@@ -41,14 +41,14 @@ pub fn encode_ec_public_pem(x: &[u8]) -> Result<String> {
 pub fn encode_ec_public_der(x: &[u8]) -> Result<Vec<u8>> {
     match simple_asn1::to_der(&encode_ec_public_asn1(x)) {
         Ok(bytes) => Ok(bytes),
-        Err(_) => return Err(ErrorKind::InvalidEcdsaKey)?,
+        Err(_) => Err(ErrorKind::InvalidEcdsaKey.into()),
     }
 }
 
 fn encode_rsa_public_pksc8_asn1(modulus: &[u8], exponent: &[u8]) -> Result<ASN1Block> {
     let pksc1 = match simple_asn1::to_der(&encode_rsa_public_pksc1_asn1(modulus, exponent)) {
         Ok(bytes) => bytes,
-        Err(_) => return Err(ErrorKind::InvalidRsaKey)?,
+        Err(_) => return Err(ErrorKind::InvalidRsaKey.into()),
     };
     Ok(ASN1Block::Sequence(
         0,
@@ -57,7 +57,7 @@ fn encode_rsa_public_pksc8_asn1(modulus: &[u8], exponent: &[u8]) -> Result<ASN1B
                 0,
                 vec![
                     // rsaEncryption (PKCS #1)
-                    ASN1Block::ObjectIdentifier(0, simple_asn1::oid!(1, 2, 840, 113549, 1, 1, 1)),
+                    ASN1Block::ObjectIdentifier(0, simple_asn1::oid!(1, 2, 840, 113_549, 1, 1, 1)),
                     ASN1Block::Null(0),
                 ],
             ),