Merge branch 'main' into km/cose-key-rotation

Author: quexten

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

@@ -595,9 +595,12 @@ pub fn make_user_signing_keys_for_enrollment(
 
     // Make new keypair and sign the public key with it
     let signature_keypair = SigningKey::make(SignatureAlgorithm::Ed25519);
+    let temporary_signature_keypair_id = SigningKeyId::Local("temporary_key_for_rotation");
+    #[allow(deprecated)]
+    ctx.set_signing_key(temporary_signature_keypair_id, signature_keypair.clone())?;
     let signed_public_key = ctx.make_signed_public_key(
         AsymmetricKeyId::UserPrivateKey,
-        SigningKeyId::UserSigningKey,
+        temporary_signature_keypair_id,
     )?;
 
     Ok(MakeUserSigningKeysResponse {

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

@@ -34,6 +34,8 @@ key_ids! {
     #[signing]
     pub enum SigningKeyId {
         UserSigningKey,
+        #[local]
+        Local(&'static str),
     }
 
     pub KeyIds => SymmetricKeyId, AsymmetricKeyId, SigningKeyId;