Fix tests

Author: quexten

crates/bitwarden-crypto/src/key_rotation/mod.rs

@@ -19,7 +19,7 @@ pub struct RotatedUserKeys {
 
 /// Re-encrypts the user's keys with the provided symmetric key for a v2 user.
 pub(crate) fn get_v2_rotated_account_keys<Ids: crate::KeyIds>(
-    new_user_key: SymmetricCryptoKey,
+    new_user_key: &SymmetricCryptoKey,
     current_user_private_key_id: Ids::Asymmetric,
     current_user_signing_key_id: Ids::Signing,
     ctx: &KeyStoreContext<Ids>,

crates/bitwarden-crypto/src/store/context.rs

@@ -519,7 +519,7 @@ impl<Ids: KeyIds> KeyStoreContext<'_, Ids> {
     /// Re-encrypts the user's keys with the provided symmetric key for a v2 user.
     pub fn dangerous_get_v2_rotated_account_keys(
         &self,
-        new_user_key: SymmetricCryptoKey,
+        new_user_key: &SymmetricCryptoKey,
         current_user_private_key_id: Ids::Asymmetric,
         current_user_signing_key_id: Ids::Signing,
     ) -> Result<RotatedUserKeys> {
@@ -544,7 +544,7 @@ mod tests {
         },
         traits::tests::{TestAsymmKey, TestIds, TestSigningKey, TestSymmKey},
         AsymmetricCryptoKey, AsymmetricPublicCryptoKey, CompositeEncryptable, CoseKeyBytes,
-        CoseSerializable, Decryptable, KeyDecryptable, Pkcs8PrivateKeyBytes,
+        CoseSerializable, CryptoError, Decryptable, KeyDecryptable, Pkcs8PrivateKeyBytes,
         PublicKeyEncryptionAlgorithm, SignatureAlgorithm, SignedPublicKey, SigningKey,
         SigningNamespace, SpkiPublicKeyBytes, SymmetricCryptoKey,
     };
@@ -759,23 +759,23 @@ mod tests {
         // Get the rotated account keys
         let rotated_keys = ctx
             .dangerous_get_v2_rotated_account_keys(
-                new_user_key,
+                &new_user_key,
                 current_user_private_key_id,
                 current_user_signing_key_id,
             )
             .unwrap();
 
-        let user_key = ctx.get_symmetric_key(TestSymmKey::A(0)).unwrap();
-
         // Public/Private key
         assert_eq!(
             AsymmetricPublicCryptoKey::from_der(&rotated_keys.public_key).unwrap(),
             ctx.get_asymmetric_key(current_user_private_key_id)
                 .unwrap()
                 .to_public_key(),
         );
-        let decrypted_private_key: Vec<u8> =
-            rotated_keys.private_key.decrypt_with_key(user_key).unwrap();
+        let decrypted_private_key: Vec<u8> = rotated_keys
+            .private_key
+            .decrypt_with_key(&new_user_key)
+            .unwrap();
         let private_key =
             AsymmetricCryptoKey::from_der(&Pkcs8PrivateKeyBytes::from(decrypted_private_key))
                 .unwrap();
@@ -788,8 +788,10 @@ mod tests {
         );
 
         // Signing Key
-        let decrypted_signing_key: Vec<u8> =
-            rotated_keys.signing_key.decrypt_with_key(user_key).unwrap();
+        let decrypted_signing_key: Vec<u8> = rotated_keys
+            .signing_key
+            .decrypt_with_key(&new_user_key)
+            .unwrap();
         let signing_key =
             SigningKey::from_cose(&CoseKeyBytes::from(decrypted_signing_key)).unwrap();
         assert_eq!(