From fef41ac1d1f56bb0fec1ea87bbd5ece281e7c7a2 Mon Sep 17 00:00:00 2001
From: TommyLike <tommylikehu@gmail.com>
Date: Thu, 31 Aug 2023 11:17:30 +0800
Subject: [PATCH] Fix cargo clippy issue

---
 src/client/file_handler/rpm.rs        | 10 +++++-----
 src/domain/datakey/plugins/openpgp.rs | 22 +++++++++++-----------
 src/domain/datakey/plugins/x509.rs    | 16 ++++++++--------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/client/file_handler/rpm.rs b/src/client/file_handler/rpm.rs
index 22473c9..383575d 100644
--- a/src/client/file_handler/rpm.rs
+++ b/src/client/file_handler/rpm.rs
@@ -52,12 +52,12 @@ impl RpmFileHandler {
                         key_type
                     }
                     Err(_) => {
-                        OpenPGPKeyType::RSA
+                        OpenPGPKeyType::Rsa
                     }
                 }
             }
             None => {
-                OpenPGPKeyType::RSA
+                OpenPGPKeyType::Rsa
             }
         }
     }
@@ -96,7 +96,7 @@ impl FileHandler for RpmFileHandler {
         let mut header_bytes = Vec::<u8>::with_capacity(1024);
         //collect head and head&payload arrays
         package.metadata.header.write(&mut header_bytes)?;
-        return if self.get_key_type(key_attributes) == OpenPGPKeyType::RSA {
+        return if self.get_key_type(key_attributes) == OpenPGPKeyType::Rsa {
             let mut header_and_content = Vec::new();
             header_and_content.extend(header_bytes.clone());
             header_and_content.extend(package.content.clone());
@@ -126,7 +126,7 @@ impl FileHandler for RpmFileHandler {
 
         let key_type = self.get_key_type(key_attributes);
         let builder = match key_type {
-            OpenPGPKeyType::RSA => {
+            OpenPGPKeyType::Rsa => {
                 Header::<IndexSignatureTag>::builder().add_digest(
                     &header_digest_sha1,
                     &header_digest_sha256,
@@ -136,7 +136,7 @@ impl FileHandler for RpmFileHandler {
                     data[1].as_slice(),
                 )
             }
-            OpenPGPKeyType::EDDSA => {
+            OpenPGPKeyType::Eddsa => {
                 Header::<IndexSignatureTag>::builder().add_digest(
                     &header_digest_sha1,
                     &header_digest_sha256,
diff --git a/src/domain/datakey/plugins/openpgp.rs b/src/domain/datakey/plugins/openpgp.rs
index 795bd06..c5cc5f4 100644
--- a/src/domain/datakey/plugins/openpgp.rs
+++ b/src/domain/datakey/plugins/openpgp.rs
@@ -26,9 +26,9 @@ pub const PGP_VALID_KEY_SIZE: [&str; 3] = ["2048", "3072", "4096"];
 #[derive(Debug, Clone, PartialEq, Sequence, Deserialize)]
 pub enum OpenPGPKeyType {
     #[serde(rename = "rsa")]
-    RSA,
+    Rsa,
     #[serde(rename = "eddsa")]
-    EDDSA,
+    Eddsa,
 }
 
 impl FromStr for OpenPGPKeyType {
@@ -36,8 +36,8 @@ impl FromStr for OpenPGPKeyType {
 
     fn from_str(s: &str) -> Result<Self> {
         match s {
-            "rsa" => Ok(OpenPGPKeyType::RSA),
-            "eddsa" => Ok(OpenPGPKeyType::EDDSA),
+            "rsa" => Ok(OpenPGPKeyType::Rsa),
+            "eddsa" => Ok(OpenPGPKeyType::Eddsa),
             _ => Err(Error::UnsupportedTypeError(format!("unsupported openpgp key state {}", s))),
         }
     }
@@ -46,8 +46,8 @@ impl FromStr for OpenPGPKeyType {
 impl Display for OpenPGPKeyType {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         match self {
-            OpenPGPKeyType::RSA => write!(f, "rsa"),
-            OpenPGPKeyType::EDDSA => write!(f, "eddsa"),
+            OpenPGPKeyType::Rsa => write!(f, "rsa"),
+            OpenPGPKeyType::Eddsa => write!(f, "eddsa"),
         }
     }
 }
@@ -56,14 +56,14 @@ impl OpenPGPKeyType {
     //key length defaults to 2048
     pub fn get_real_key_type(&self, key_length: Option<String>) -> KeyType {
         match self {
-           OpenPGPKeyType::RSA => {
-               if key_length.is_none() {
-                   KeyType::Rsa(2048)
+           OpenPGPKeyType::Rsa => {
+               if let Some(length) = key_length {
+                   KeyType::Rsa(length.parse().unwrap())
                } else {
-                   KeyType::Rsa(key_length.unwrap().parse().unwrap())
+                   KeyType::Rsa(2048)
                }
            },
-           OpenPGPKeyType::EDDSA => KeyType::EdDSA
+           OpenPGPKeyType::Eddsa => KeyType::EdDSA
         }
     }
 }
diff --git a/src/domain/datakey/plugins/x509.rs b/src/domain/datakey/plugins/x509.rs
index befa8f8..4b2fe5c 100644
--- a/src/domain/datakey/plugins/x509.rs
+++ b/src/domain/datakey/plugins/x509.rs
@@ -27,9 +27,9 @@ pub const X509_VALID_KEY_SIZE: [&str; 3] = ["2048", "3072", "4096"];
 #[derive(Debug, Clone, PartialEq, Sequence, Deserialize)]
 pub enum X509KeyType {
     #[serde(rename = "rsa")]
-    RSA,
+    Rsa,
     #[serde(rename = "dsa")]
-    DSA,
+    Dsa,
 }
 
 impl FromStr for X509KeyType {
@@ -37,8 +37,8 @@ impl FromStr for X509KeyType {
 
     fn from_str(s: &str) -> Result<Self> {
         match s {
-            "rsa" => Ok(X509KeyType::RSA),
-            "dsa" => Ok(X509KeyType::DSA),
+            "rsa" => Ok(X509KeyType::Rsa),
+            "dsa" => Ok(X509KeyType::Dsa),
             _ => Err(Error::UnsupportedTypeError(format!("unsupported x509 key type {}", s))),
         }
     }
@@ -47,8 +47,8 @@ impl FromStr for X509KeyType {
 impl Display for X509KeyType {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         match self {
-            X509KeyType::RSA => write!(f, "rsa"),
-            X509KeyType::DSA => write!(f, "dsa"),
+            X509KeyType::Rsa => write!(f, "rsa"),
+            X509KeyType::Dsa => write!(f, "dsa"),
         }
     }
 }
@@ -56,8 +56,8 @@ impl Display for X509KeyType {
 impl X509KeyType {
     pub fn get_real_key_type(&self, key_length: u32) -> Result<PKey<Private>> {
         match self {
-            X509KeyType::RSA => Ok(PKey::from_rsa(Rsa::generate(key_length)?)?),
-            X509KeyType::DSA => Ok(PKey::from_dsa(Dsa::generate(key_length)?)?),
+            X509KeyType::Rsa => Ok(PKey::from_rsa(Rsa::generate(key_length)?)?),
+            X509KeyType::Dsa => Ok(PKey::from_dsa(Dsa::generate(key_length)?)?),
         }
     }
 }
-- 
Gitee