Add plain security version

Author: quexten

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

@@ -602,6 +602,8 @@ pub struct EnrollUserCryptoV2Response {
 
     /// The user's signed security state
     signed_security_state: SignedSecurityState,
+    /// The security state's version
+    security_version: u64,
 }
 
 /// Initializes the user's cryptographic state for v2 users.
@@ -673,6 +675,7 @@ pub fn make_keys_for_user_crypto_v2(
         verifying_key: STANDARD.encode(signing_key.to_verifying_key().to_cose()),
 
         signed_security_state,
+        security_version: security_state.version(),
     })
 }
 

crates/bitwarden-crypto/src/security_state.rs

@@ -69,6 +69,11 @@ impl SecurityState {
             signing_key.sign(self, &SigningNamespace::SecurityState)?,
         ))
     }
+
+    /// Returns the version of the security state
+    pub fn version(&self) -> u64 {
+        self.version
+    }
 }
 
 /// Signs the `SecurityState` with the provided signing key ID from the context.
@@ -183,6 +188,6 @@ mod tests {
             ),
             user_id
         );
-        assert_eq!(verified_security_state.version, 1);
+        assert_eq!(verified_security_state.version(), 1);
     }
 }