Fix build and cleanup

Author: quexten

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

@@ -1,3 +1,4 @@
+use bitwarden_crypto::{CoseKeyBytes, Pkcs8PrivateKeyBytes};
 #[cfg(feature = "internal")]
 use bitwarden_crypto::{EncString, UnsignedSharedKey};
 #[cfg(any(feature = "internal", feature = "secrets"))]
@@ -58,8 +59,6 @@ impl EncryptionSettings {
         use crate::key_management::{AsymmetricKeyId, SigningKeyId, SymmetricKeyId};
 
         let private_key = {
-            use bitwarden_crypto::Bytes;
-
             let dec: Vec<u8> = private_key.decrypt_with_key(&user_key)?;
             // FIXME: [PM-11690] - Temporarily ignore invalid private keys until we have a recovery
             // process in place.
@@ -81,12 +80,10 @@ impl EncryptionSettings {
             let mut ctx = store.context_mut();
 
             if let Some(signing_key) = signing_key {
-                use bitwarden_crypto::Bytes;
-
                 let dec: Vec<u8> = signing_key
                     .decrypt_with_key(&user_key)
                     .map_err(|_| EncryptionSettingsError::InvalidSigningKey)?;
-                let signing_key = SigningKey::from_cose(&Bytes::from(dec))
+                let signing_key = SigningKey::from_cose(&CoseKeyBytes::from(dec))
                     .map_err(|_| EncryptionSettingsError::InvalidSigningKey)?;
                 ctx.set_signing_key(SigningKeyId::UserSigningKey, signing_key)?;
             }

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

@@ -8,7 +8,7 @@ use std::collections::HashMap;
 
 use base64::{engine::general_purpose::STANDARD, Engine};
 use bitwarden_crypto::{
-    AsymmetricCryptoKey, Bytes, CoseSerializable, CryptoError, EncString, Kdf, KeyDecryptable,
+    AsymmetricCryptoKey, CoseSerializable, CryptoError, EncString, Kdf, KeyDecryptable,
     KeyEncryptable, MasterKey, Pkcs8PrivateKeyBytes, PrimitiveEncryptable, SignatureAlgorithm,
     SignedPublicKey, SigningKey, SymmetricCryptoKey, UnsignedSharedKey, UserKey,
 };

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

@@ -11,10 +11,7 @@ use serde_repr::{Deserialize_repr, Serialize_repr};
 
 use super::AsymmetricPublicCryptoKey;
 use crate::{
-    content_format::{Bytes, CoseSign1ContentFormat},
-    cose::CoseSerializable,
-    error::EncodingError,
-    util::FromStrVisitor,
+    cose::CoseSerializable, error::EncodingError, util::FromStrVisitor, CoseSign1Bytes,
     CryptoError, PublicKeyEncryptionAlgorithm, RawPublicKey, SignedObject, SigningKey,
     SigningNamespace, VerifyingKey,
 };
@@ -89,9 +86,9 @@ impl From<SignedPublicKey> for Vec<u8> {
 impl TryFrom<Vec<u8>> for SignedPublicKey {
     type Error = EncodingError;
     fn try_from(bytes: Vec<u8>) -> Result<Self, EncodingError> {
-        Ok(SignedPublicKey(SignedObject::from_cose(&CoseSign1ContentFormat::from(
-            bytes
-        ))?))
+        Ok(SignedPublicKey(SignedObject::from_cose(
+            &CoseSign1Bytes::from(bytes),
+        )?))
     }
 }