Move content format to separate file

Author: quexten

crates/bitwarden-crypto/src/content_format.rs

@@ -0,0 +1,28 @@
+use serde::{Deserialize, Serialize};
+#[cfg(feature = "wasm")]
+use tsify_next::Tsify;
+
+/// The content format describes the format of the contained bytes. Message encryption always
+/// happens on the byte level, and this allows determining what format the contained data has. For
+/// instance, an `EncString` in most cases contains UTF-8 encoded text. In some cases it may contain
+/// a Pkcs8 private key, or a COSE key. Specifically, for COSE keys, this allows distinguishing
+/// between the old symmetric key format, represented as `ContentFormat::OctetStream`, and the new
+/// COSE key format, represented as `ContentFormat::CoseKey`.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+#[cfg_attr(feature = "wasm", derive(Tsify), tsify(into_wasm_abi, from_wasm_abi))]
+pub enum ContentFormat {
+    /// UTF-8 encoded text
+    Utf8,
+    /// Pkcs8 private key DER
+    Pkcs8,
+    /// COSE serialized CoseKey
+    CoseKey,
+    /// Bitwarden Legacy Key
+    /// There are three permissible byte values here:
+    /// - [u8; 32] - AES-CBC (no hmac) key. This is to be removed and banned.
+    /// - [u8; 64] - AES-CBC with HMAC key. This is the v1 userkey key type
+    /// - [u8; >64] - COSE key. Padded to be larger than 64 bytes.
+    BitwardenLegacyKey,
+    /// Stream of bytes
+    OctetStream,
+}

crates/bitwarden-crypto/src/cose.rs

@@ -15,7 +15,7 @@ use typenum::U32;
 
 use crate::{
     error::{EncStringParseError, EncodingError},
-    xchacha20, CryptoError, SymmetricCryptoKey, XChaCha20Poly1305Key,
+    xchacha20, ContentFormat, CryptoError, SymmetricCryptoKey, XChaCha20Poly1305Key,
 };
 
 /// XChaCha20 <https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-xchacha-03> is used over ChaCha20
@@ -29,31 +29,6 @@ const XCHACHA20_TEXT_PAD_BLOCK_SIZE: usize = 32;
 const CONTENT_TYPE_PADDED_UTF8: &str = "application/x.bitwarden.utf8-padded";
 const CONTENT_TYPE_BITWARDEN_LEGACY_KEY: &str = "application/x.bitwarden.legacy-key";
 
-/// The content format describes the format of the contained bytes. Message encryption always
-/// happens on the byte level, and this allows determining what format the contained data has. For
-/// instance, an `EncString` in most cases contains UTF-8 encoded text. In some cases it may contain
-/// a Pkcs8 private key, or a COSE key. Specifically, for COSE keys, this allows distinguishing
-/// between the old symmetric key format, represented as `ContentFormat::OctetStream`, and the new
-/// COSE key format, represented as `ContentFormat::CoseKey`.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
-#[cfg_attr(feature = "wasm", derive(Tsify), tsify(into_wasm_abi, from_wasm_abi))]
-pub enum ContentFormat {
-    /// UTF-8 encoded text
-    Utf8,
-    /// Pkcs8 private key DER
-    Pkcs8,
-    /// COSE serialized CoseKey
-    CoseKey,
-    /// Bitwarden Legacy Key
-    /// There are three permissible byte values here:
-    /// - [u8; 32] - AES-CBC (no hmac) key. This is to be removed and banned.
-    /// - [u8; 64] - AES-CBC with HMAC key. This is the v1 userkey key type
-    /// - [u8; >64] - COSE key. Padded to be larger than 64 bytes.
-    BitwardenLegacyKey,
-    /// Stream of bytes
-    OctetStream,
-}
-
 // Labels
 //
 /// The label used for the namespace ensuring strong domain separation when using signatures.
@@ -208,9 +183,7 @@ impl TryFrom<&coset::Header> for ContentFormat {
             Some(ContentType::Text(format)) if format == CONTENT_TYPE_PADDED_UTF8 => {
                 Ok(ContentFormat::Utf8)
             }
-            Some(ContentType::Text(format)) if format == CONTENT_TYPE_BITWARDEN_LEGACY_KEY => {
-                Ok(ContentFormat::BitwardenLegacyKey)
-            }
+
             Some(ContentType::Assigned(CoapContentFormat::Pkcs8)) => Ok(ContentFormat::Pkcs8),
             Some(ContentType::Assigned(CoapContentFormat::CoseKey)) => Ok(ContentFormat::CoseKey),
             Some(ContentType::Assigned(CoapContentFormat::OctetStream)) => {

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

@@ -3,7 +3,7 @@ use std::{collections::HashMap, hash::Hash, sync::Arc};
 use rayon::prelude::*;
 use uuid::Uuid;
 
-use crate::{cose::ContentFormat, error::Result, CryptoError, SymmetricCryptoKey};
+use crate::{error::Result, ContentFormat, CryptoError, SymmetricCryptoKey};
 
 #[allow(missing_docs)]
 pub trait KeyContainer: Send + Sync {

crates/bitwarden-crypto/src/lib.rs

@@ -13,6 +13,8 @@
 static ALLOC: ZeroizingAllocator<std::alloc::System> = ZeroizingAllocator(std::alloc::System);
 
 mod aes;
+mod content_format;
+pub use content_format::ContentFormat;
 mod enc_string;
 pub use enc_string::{EncString, UnsignedSharedKey};
 mod error;
@@ -35,7 +37,6 @@ pub use cose::CoseSerializable;
 mod signing;
 pub use signing::*;
 mod traits;
-pub use cose::ContentFormat;
 mod xchacha20;
 pub use traits::{
     CompositeEncryptable, Decryptable, IdentifyKey, KeyId, KeyIds, PrimitiveEncryptable,

crates/bitwarden-crypto/src/traits/encryptable.rs

@@ -138,7 +138,7 @@ impl<Ids: KeyIds, Key: KeyId, T: PrimitiveEncryptable<Ids, Key, Output>, Output>
         &self,
         ctx: &mut KeyStoreContext<Ids>,
         key: Key,
-        content_format: crate::cose::ContentFormat,
+        content_format: crate::ContentFormat,
     ) -> Result<Option<Output>, CryptoError> {
         self.as_ref()
             .map(|value| value.encrypt(ctx, key, content_format))
@@ -164,7 +164,7 @@ impl<Ids: KeyIds, Key: KeyId, T: PrimitiveEncryptable<Ids, Key, Output>, Output>
 #[cfg(test)]
 mod tests {
     use crate::{
-        cose::ContentFormat, traits::tests::*, AsymmetricCryptoKey, Decryptable, KeyStore,
+        traits::tests::*, AsymmetricCryptoKey, ContentFormat, Decryptable, KeyStore,
         PrimitiveEncryptable, PrimitiveEncryptableWithContentType, PublicKeyEncryptionAlgorithm,
         SymmetricCryptoKey,
     };