Clean up KeyEncryptable or pin key

Author: quexten

crates/bitwarden-crypto/src/keys/pin_key.rs

@@ -1,11 +1,10 @@
 use super::{
     kdf::{Kdf, KdfDerivedKeyMaterial},
-    master_key::{decrypt_user_key, encrypt_user_key},
+    master_key::decrypt_user_key,
     utils::stretch_key,
 };
 use crate::{
-    keys::key_encryptable::CryptoKey, ContentFormat, EncString, KeyEncryptable,
-    KeyEncryptableWithContentType, Result, SymmetricCryptoKey,
+    keys::key_encryptable::CryptoKey, EncString, KeyEncryptable, Result, SymmetricCryptoKey,
 };
 
 /// Pin Key.
@@ -21,7 +20,7 @@ impl PinKey {
 
     /// Encrypt the users user key
     pub fn encrypt_user_key(&self, user_key: &SymmetricCryptoKey) -> Result<EncString> {
-        encrypt_user_key(&self.0 .0, user_key)
+        user_key.encrypt_with_key(&self)
     }
 
     /// Decrypt the users user key
@@ -32,15 +31,18 @@ impl PinKey {
 
 impl CryptoKey for PinKey {}
 
-impl KeyEncryptableWithContentType<PinKey, EncString> for &[u8] {
-    fn encrypt_with_key(self, key: &PinKey, content_format: ContentFormat) -> Result<EncString> {
+impl KeyEncryptable<PinKey, EncString> for &SymmetricCryptoKey {
+    fn encrypt_with_key(self, key: &PinKey) -> Result<EncString> {
         let stretched_key = SymmetricCryptoKey::Aes256CbcHmacKey(stretch_key(&key.0 .0)?);
-        self.encrypt_with_key(&stretched_key, content_format)
+        // The (stretched) pin key is currently always an AES-256-CBC-HMAC key, and wraps a bitwarden legacy encoded symmetric key
+        self.to_encoded().encrypt_with_key(&stretched_key)
     }
 }
 
 impl KeyEncryptable<PinKey, EncString> for String {
     fn encrypt_with_key(self, key: &PinKey) -> Result<EncString> {
-        self.as_bytes().encrypt_with_key(key, ContentFormat::Utf8)
+        self.encrypt_with_key(&SymmetricCryptoKey::Aes256CbcHmacKey(stretch_key(
+            &key.0 .0,
+        )?))
     }
 }