Cleaning, thanks Clippy.

[rup.git] / src / crypto.rs

diff --git a/src/crypto.rs b/src/crypto.rs
index a7aa5b9..ddf257c 100644 (file)
--- a/src/crypto.rs
+++ b/src/crypto.rs
@@ -27,7 +27,7 @@ pub enum DecryptError {
 \r
 fn decode_key(key: &str) -> Result<Vec<u8>, KeyError> {\r
     match base64::decode(key) {\r
-        Ok(k) => if k.len() != 16 { return Err(KeyError::WrongKeyLength) } else { Ok(k) },\r
+        Ok(k) => if k.len() != 16 { Err(KeyError::WrongKeyLength) } else { Ok(k) },\r
         Err(_e) => Err(KeyError::UnableToDecodeBase64Key)\r
     }\r
 }\r
@@ -37,7 +37,7 @@ fn decode_key(key: &str) -> Result<Vec<u8>, KeyError> {
 /// IV: 16 bytes randomized.\r
 /// Mode : CBC.\r
 pub fn encrypt(key: &str, plain_text: &str) -> Result<String, EncryptError> {\r
-    let key_as_bytes = decode_key(key).map_err(|e| EncryptError::KeyError(e))?;\r
+    let key_as_bytes = decode_key(key).map_err(EncryptError::KeyError)?;\r
 \r
     let text_as_bytes = plain_text.as_bytes();\r
     let iv = rand::thread_rng().gen::<[u8; 16]>();\r
@@ -59,7 +59,7 @@ pub fn encrypt(key: &str, plain_text: &str) -> Result<String, EncryptError> {
 /// Decrypt the given text with the given key. The key length must be 128 bits encoded in base64.\r
 /// Input format: "1" + base_64(<IV> + <hash(message)> + <aes(message)>)\r
 pub fn decrypt(key: &str, cipher_text: &str) -> Result<String, DecryptError> {\r
-    let key_as_bytes = decode_key(key).map_err(|e| DecryptError::KeyError(e))?;\r
+    let key_as_bytes = decode_key(key).map_err(DecryptError::KeyError)?;\r
 \r
     // Can't decrypt a message with the wrong version.\r
     if !cipher_text.starts_with(consts::CURRENT_MESSAGE_VERSION) { return Err(DecryptError::WrongMessageVersion) }\r