Update crates/bitwarden-vault/src/cipher/ssh_key.rs

Co-authored-by: Daniel García <dani-garcia@users.noreply.github.com>
bitwarden · Oct 29, 2024 · 9e7b0c6 · 9e7b0c6
1 parent 6fceec3
commit 9e7b0c6
Showing 1 changed file with 3 additions and 15 deletions.
diff --git a/crates/bitwarden-vault/src/cipher/ssh_key.rs b/crates/bitwarden-vault/src/cipher/ssh_key.rs
@@ -41,21 +41,9 @@ impl KeyEncryptable<SymmetricCryptoKey, SshKey> for SshKeyView {
 impl KeyDecryptable<SymmetricCryptoKey, SshKeyView> for SshKey {
     fn decrypt_with_key(&self, key: &SymmetricCryptoKey) -> Result<SshKeyView, CryptoError> {
         Ok(SshKeyView {
-            private_key: Some(self.private_key.clone())
-                .decrypt_with_key(key)
-                .ok()
-                .flatten()
-                .ok_or(CryptoError::MissingField("private_key"))?,
-            public_key: Some(self.public_key.clone())
-                .decrypt_with_key(key)
-                .ok()
-                .flatten()
-                .ok_or(CryptoError::MissingField("public_key"))?,
-            fingerprint: Some(self.fingerprint.clone())
-                .decrypt_with_key(key)
-                .ok()
-                .flatten()
-                .ok_or(CryptoError::MissingField("fingerprint"))?,
+            private_key: self.private_key.decrypt_with_key(key)?,
+            public_key: self.public_key.decrypt_with_key(key)?,
+            fingerprint: self.fingerprint.decrypt_with_key(key)?,
         })
     }
 }