[PM-18104] Implement generic key decryption in KeyStoreContext

crates/bitwarden-core/src/auth/auth_client.rs

@@ -191,7 +191,7 @@
     let ctx = key_store.context();
     // FIXME: [PM-18099] Once DeviceKey deals with KeyIds, this should be updated
     #[allow(deprecated)]
-    let user_key = ctx.dangerous_get_symmetric_key(SymmetricKeyId::User)?;
+    let user_key = ctx.dangerous_get_key(SymmetricKeyId::User)?;
 
     Ok(DeviceKey::trust_device(user_key)?)
 }

crates/bitwarden-core/src/auth/auth_request.rs

@@ -99,7 +99,7 @@ pub(crate) fn approve_auth_request(
 
     // FIXME: [PM-18110] This should be removed once the key store can handle public key encryption
     #[allow(deprecated)]
-    let key = ctx.dangerous_get_symmetric_key(SymmetricKeyId::User)?;
+    let key = ctx.dangerous_get_key(SymmetricKeyId::User)?;
 
     Ok(AsymmetricEncString::encrypt_rsa2048_oaep_sha1(
         &key.to_vec(),
@@ -258,7 +258,7 @@ mod tests {
             let key_store = existing_device.internal.get_key_store();
             let ctx = key_store.context();
             #[allow(deprecated)]
-            ctx.dangerous_get_symmetric_key(SymmetricKeyId::User)
+            ctx.dangerous_get_key(SymmetricKeyId::User)
                 .unwrap()
                 .to_base64()
         };
@@ -267,7 +267,7 @@ mod tests {
             let key_store = new_device.internal.get_key_store();
             let ctx = key_store.context();
             #[allow(deprecated)]
-            ctx.dangerous_get_symmetric_key(SymmetricKeyId::User)
+            ctx.dangerous_get_key(SymmetricKeyId::User)
                 .unwrap()
                 .to_base64()
         };

crates/bitwarden-core/src/auth/password/validate.rs

@@ -64,7 +64,7 @@ pub(crate) fn validate_password_user_key(
                 let ctx = key_store.context();
                 // FIXME: [PM-18099] Once MasterKey deals with KeyIds, this should be updated
                 #[allow(deprecated)]
-                let existing_key = ctx.dangerous_get_symmetric_key(SymmetricKeyId::User)?;
+                let existing_key = ctx.dangerous_get_key(SymmetricKeyId::User)?;
 
                 if user_key.to_vec() != existing_key.to_vec() {
                     return Err(AuthValidateError::WrongUserKey);

crates/bitwarden-core/src/auth/pin.rs

@@ -30,7 +30,7 @@ pub(crate) fn validate_pin(
             let ctx = key_store.context();
             // FIXME: [PM-18099] Once PinKey deals with KeyIds, this should be updated
             #[allow(deprecated)]
-            let user_key = ctx.dangerous_get_symmetric_key(SymmetricKeyId::User)?;
+            let user_key = ctx.dangerous_get_key(SymmetricKeyId::User)?;
 
             let pin_key = PinKey::derive(pin.as_bytes(), email.as_bytes(), kdf)?;
 

crates/bitwarden-core/src/auth/renew.rs

@@ -77,7 +77,7 @@
                         let key_store = client.get_key_store();
                         let ctx = key_store.context();
                         #[allow(deprecated)]
-                        if let Ok(enc_key) = ctx.dangerous_get_symmetric_key(SymmetricKeyId::User) {
+                        if let Ok(enc_key) = ctx.dangerous_get_key(SymmetricKeyId::User) {
                             let state =
                                 ClientState::new(r.access_token.clone(), enc_key.to_base64());
                             _ = state::set(state_file, access_token, state);

crates/bitwarden-core/src/client/encryption_settings.rs

@@ -70,9 +70,9 @@
         #[allow(deprecated)]
         {
             let mut ctx = store.context_mut();
-            ctx.set_symmetric_key(SymmetricKeyId::User, user_key)?;
+            ctx.set_key(SymmetricKeyId::User, user_key)?;
             if let Some(private_key) = private_key {
-                ctx.set_asymmetric_key(AsymmetricKeyId::UserPrivateKey, private_key)?;
+                ctx.set_key(AsymmetricKeyId::UserPrivateKey, private_key)?;
             }
         }
 
@@ -87,7 +87,7 @@
         #[allow(deprecated)]
         store
             .context_mut()
-            .set_symmetric_key(SymmetricKeyId::User, key)
+            .set_key(SymmetricKeyId::User, key)
             .expect("Mutable context");
     }
 
@@ -103,7 +103,7 @@
             return Ok(());
         }
 
-        if !ctx.has_asymmetric_key(AsymmetricKeyId::UserPrivateKey) {
+        if !ctx.has_key(AsymmetricKeyId::UserPrivateKey) {
             return Err(EncryptionSettingsError::MissingPrivateKey);
         }
 
@@ -113,7 +113,7 @@
 
         // Decrypt the org keys with the private key
         for (org_id, org_enc_key) in org_enc_keys {
-            ctx.decrypt_symmetric_key_with_asymmetric_key(
+            ctx.decrypt_key_into_store(
                 AsymmetricKeyId::UserPrivateKey,
                 SymmetricKeyId::Organization(org_id),
                 &org_enc_key,

crates/bitwarden-core/src/key_management/mod.rs

@@ -38,7 +38,7 @@ pub fn create_test_crypto_with_user_key(key: SymmetricCryptoKey) -> KeyStore<Key
     #[allow(deprecated)]
     store
         .context_mut()
-        .set_symmetric_key(SymmetricKeyId::User, key.clone())
+        .set_key(SymmetricKeyId::User, key.clone())
         .expect("Mutable context");
 
     store
@@ -58,13 +58,13 @@ pub fn create_test_crypto_with_user_and_org_key(
     #[allow(deprecated)]
     store
         .context_mut()
-        .set_symmetric_key(SymmetricKeyId::User, key.clone())
+        .set_key(SymmetricKeyId::User, key.clone())
         .expect("Mutable context");
 
     #[allow(deprecated)]
     store
         .context_mut()
-        .set_symmetric_key(SymmetricKeyId::Organization(org_id), org_key.clone())
+        .set_key(SymmetricKeyId::Organization(org_id), org_key.clone())
         .expect("Mutable context");
 
     store

crates/bitwarden-core/src/mobile/crypto.rs

@@ -223,7 +223,7 @@
     let ctx = key_store.context();
     // This is needed because the mobile clients need access to the user encryption key
     #[allow(deprecated)]
-    let user_key = ctx.dangerous_get_symmetric_key(SymmetricKeyId::User)?;
+    let user_key = ctx.dangerous_get_key(SymmetricKeyId::User)?;
 
     Ok(user_key.to_base64())
 }
@@ -246,7 +246,7 @@
     let ctx = key_store.context();
     // FIXME: [PM-18099] Once MasterKey deals with KeyIds, this should be updated
     #[allow(deprecated)]
-    let user_key = ctx.dangerous_get_symmetric_key(SymmetricKeyId::User)?;
+    let user_key = ctx.dangerous_get_key(SymmetricKeyId::User)?;
 
     let login_method = client
         .internal
@@ -294,7 +294,7 @@
     let ctx = key_store.context();
     // FIXME: [PM-18099] Once PinKey deals with KeyIds, this should be updated
     #[allow(deprecated)]
-    let user_key = ctx.dangerous_get_symmetric_key(SymmetricKeyId::User)?;
+    let user_key = ctx.dangerous_get_key(SymmetricKeyId::User)?;
 
     let login_method = client
         .internal
@@ -317,7 +317,7 @@
     let ctx = key_store.context();
     // FIXME: [PM-18099] Once PinKey deals with KeyIds, this should be updated
     #[allow(deprecated)]
-    let user_key = ctx.dangerous_get_symmetric_key(SymmetricKeyId::User)?;
+    let user_key = ctx.dangerous_get_key(SymmetricKeyId::User)?;
 
     let pin: String = encrypted_pin.decrypt_with_key(user_key)?;
     let login_method = client
@@ -370,7 +370,7 @@
     let ctx = key_store.context();
     // FIXME: [PM-18110] This should be removed once the key store can handle public key encryption
     #[allow(deprecated)]
-    let key = ctx.dangerous_get_symmetric_key(SymmetricKeyId::User)?;
+    let key = ctx.dangerous_get_key(SymmetricKeyId::User)?;
 
     Ok(AsymmetricEncString::encrypt_rsa2048_oaep_sha1(
         &key.to_vec(),
@@ -581,7 +581,7 @@
             let key_store = client.internal.get_key_store();
             let ctx = key_store.context();
             #[allow(deprecated)]
-            ctx.dangerous_get_symmetric_key(SymmetricKeyId::User)
+            ctx.dangerous_get_key(SymmetricKeyId::User)
                 .unwrap()
                 .to_base64()
         };
@@ -590,7 +590,7 @@
             let key_store = client2.internal.get_key_store();
             let ctx = key_store.context();
             #[allow(deprecated)]
-            ctx.dangerous_get_symmetric_key(SymmetricKeyId::User)
+            ctx.dangerous_get_key(SymmetricKeyId::User)
                 .unwrap()
                 .to_base64()
         };
@@ -646,7 +646,7 @@
             let key_store = client.internal.get_key_store();
             let ctx = key_store.context();
             #[allow(deprecated)]
-            ctx.dangerous_get_symmetric_key(SymmetricKeyId::User)
+            ctx.dangerous_get_key(SymmetricKeyId::User)
                 .unwrap()
                 .to_base64()
         };
@@ -655,7 +655,7 @@
             let key_store = client2.internal.get_key_store();
             let ctx = key_store.context();
             #[allow(deprecated)]
-            ctx.dangerous_get_symmetric_key(SymmetricKeyId::User)
+            ctx.dangerous_get_key(SymmetricKeyId::User)
                 .unwrap()
                 .to_base64()
         };
@@ -688,7 +688,7 @@
             let key_store = client.internal.get_key_store();
             let ctx = key_store.context();
             #[allow(deprecated)]
-            ctx.dangerous_get_symmetric_key(SymmetricKeyId::User)
+            ctx.dangerous_get_key(SymmetricKeyId::User)
                 .unwrap()
                 .to_base64()
         };
@@ -697,7 +697,7 @@
             let key_store = client3.internal.get_key_store();
             let ctx = key_store.context();
             #[allow(deprecated)]
-            ctx.dangerous_get_symmetric_key(SymmetricKeyId::User)
+            ctx.dangerous_get_key(SymmetricKeyId::User)
                 .unwrap()
                 .to_base64()
         };
@@ -740,9 +740,7 @@
         let key_store = client.internal.get_key_store();
         let ctx = key_store.context();
         #[allow(deprecated)]
-        let expected = ctx
-            .dangerous_get_symmetric_key(SymmetricKeyId::User)
-            .unwrap();
+        let expected = ctx.dangerous_get_key(SymmetricKeyId::User).unwrap();
 
         assert_eq!(&decrypted, &expected.to_vec());
     }

crates/bitwarden-core/src/platform/generate_fingerprint.rs

@@ -66,7 +66,7 @@ pub(crate) fn generate_user_fingerprint(
     // FIXME: [PM-18110] This should be removed once the key store can handle public keys and
     // fingerprints
     #[allow(deprecated)]
-    let private_key = ctx.dangerous_get_asymmetric_key(AsymmetricKeyId::UserPrivateKey)?;
+    let private_key = ctx.dangerous_get_key(AsymmetricKeyId::UserPrivateKey)?;
 
     let public_key = private_key.to_public_der()?;
     let fingerprint = fingerprint(&fingerprint_material, &public_key)?;