Rename to bytes

Author: quexten

crates/bitwarden-core/src/auth/auth_request.rs

@@ -111,7 +111,7 @@ mod tests {
     use std::num::NonZeroU32;
 
     use bitwarden_crypto::{
-        BitwardenLegacyKeyContentFormat, Kdf, MasterKey, SerializedBytes,
+        BitwardenLegacyKeyContentFormat, Kdf, MasterKey, Bytes,
         SpkiPublicKeyDerContentFormat,
     };
 
@@ -136,7 +136,7 @@ mod tests {
             AsymmetricCryptoKey::from_der(&STANDARD.decode(&request.private_key).unwrap().into())
                 .unwrap();
 
-        let secret = SerializedBytes::<BitwardenLegacyKeyContentFormat>::from(secret);
+        let secret = Bytes::<BitwardenLegacyKeyContentFormat>::from(secret);
         let encrypted = UnsignedSharedKey::encapsulate_key_unsigned(
             &SymmetricCryptoKey::try_from(&secret).unwrap(),
             &private_key.to_public_key(),
@@ -172,7 +172,7 @@ mod tests {
 
         // Verify fingerprint
         let pubkey = STANDARD.decode(public_key).unwrap();
-        let pubkey = SerializedBytes::<SpkiPublicKeyDerContentFormat>::from(pubkey.clone());
+        let pubkey = Bytes::<SpkiPublicKeyDerContentFormat>::from(pubkey.clone());
         let fingerprint = fingerprint("[email protected]", &pubkey).unwrap();
         assert_eq!(fingerprint, "childless-unfair-prowler-dropbox-designate");
 

crates/bitwarden-core/src/auth/login/access_token.rs

@@ -2,7 +2,7 @@ use std::path::{Path, PathBuf};
 
 use base64::{engine::general_purpose::STANDARD, Engine};
 use bitwarden_crypto::{
-    BitwardenLegacyKeyContentFormat, EncString, KeyDecryptable, SerializedBytes, SymmetricCryptoKey,
+    BitwardenLegacyKeyContentFormat, EncString, KeyDecryptable, Bytes, SymmetricCryptoKey,
 };
 use chrono::Utc;
 use schemars::JsonSchema;
@@ -70,7 +70,7 @@ pub(crate) async fn login_access_token(
         let payload: Payload = serde_json::from_slice(&decrypted_payload)?;
         let encryption_key = STANDARD.decode(&payload.encryption_key)?;
         let encryption_key =
-            SerializedBytes::<BitwardenLegacyKeyContentFormat>::from(encryption_key);
+            Bytes::<BitwardenLegacyKeyContentFormat>::from(encryption_key);
         let encryption_key = SymmetricCryptoKey::try_from(&encryption_key)?;
 
         let access_token_obj: JwtToken = r.access_token.parse()?;

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

@@ -58,10 +58,10 @@ impl EncryptionSettings {
         use crate::key_management::{AsymmetricKeyId, SigningKeyId, SymmetricKeyId};
 
         let private_key = {
-            use bitwarden_crypto::{Pkcs8PrivateKeyDerContentFormat, SerializedBytes};
+            use bitwarden_crypto::{Pkcs8PrivateKeyDerContentFormat, Bytes};
 
             let dec: Vec<u8> = private_key.decrypt_with_key(&user_key)?;
-            let dec: SerializedBytes<Pkcs8PrivateKeyDerContentFormat> = SerializedBytes::from(dec);
+            let dec: Bytes<Pkcs8PrivateKeyDerContentFormat> = Bytes::from(dec);
             // FIXME: [PM-11690] - Temporarily ignore invalid private keys until we have a recovery
             // process in place.
             AsymmetricCryptoKey::from_der(&dec)
@@ -82,12 +82,12 @@ impl EncryptionSettings {
             let mut ctx = store.context_mut();
 
             if let Some(signing_key) = signing_key {
-                use bitwarden_crypto::SerializedBytes;
+                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(&SerializedBytes::from(dec))
+                let signing_key = SigningKey::from_cose(&Bytes::from(dec))
                     .map_err(|_| EncryptionSettingsError::InvalidSigningKey)?;
                 ctx.set_signing_key(SigningKeyId::UserSigningKey, signing_key)?;
             }

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

@@ -10,7 +10,7 @@ use base64::{engine::general_purpose::STANDARD, Engine};
 use bitwarden_crypto::{
     AsymmetricCryptoKey, CoseSerializable, CryptoError, EncString, Kdf, KeyDecryptable,
     KeyEncryptable, MasterKey, Pkcs8PrivateKeyDerContentFormat, PrimitiveEncryptable,
-    SerializedBytes, SignatureAlgorithm, SignedPublicKey, SigningKey, SymmetricCryptoKey,
+    Bytes, SignatureAlgorithm, SignedPublicKey, SigningKey, SymmetricCryptoKey,
     UnsignedSharedKey, UserKey,
 };
 use bitwarden_error::bitwarden_error;
@@ -537,8 +537,8 @@ pub(super) fn verify_asymmetric_keys(
             .decrypt_with_key(user_key)
             .map_err(VerifyError::DecryptFailed)?;
 
-        let decrypted_private_key: SerializedBytes<Pkcs8PrivateKeyDerContentFormat> =
-            SerializedBytes::from(decrypted_private_key);
+        let decrypted_private_key: Bytes<Pkcs8PrivateKeyDerContentFormat> =
+            Bytes::from(decrypted_private_key);
         let private_key = AsymmetricCryptoKey::from_der(&decrypted_private_key)
             .map_err(VerifyError::ParseFailed)?;
 
@@ -844,7 +844,7 @@ mod tests {
 
         let private_key = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCzLtEUdxfcLxDj84yaGFsVF5hZ8Hjlb08NMQDy1RnBma06I3ZESshLYzVz4r/gegMn9OOltfV/Yxlyvida8oW6qdlfJ7AVz6Oa8pV7BiL40C7b76+oqraQpyYw2HChANB1AhXL9SqWngKmLZwjA7qiCrmcc0kZHeOb4KnKtp9iVvPVs+8veFvKgYO4ba2AAOHKFdR0W55/agXfAy+fWUAkC8mc9ikyJdQWaPV6OZvC2XFkOseBQm9Rynudh3BQpoWiL6w620efe7t5k+02/EyOFJL9f/XEEjM/+Yo0t3LAfkuhHGeKiRST59Xc9hTEmyJTeVXROtz+0fjqOp3xkaObAgMBAAECggEACs4xhnO0HaZhh1/iH7zORMIRXKeyxP2LQiTR8xwN5JJ9wRWmGAR9VasS7EZFTDidIGVME2u/h4s5EqXnhxfO+0gGksVvgNXJ/qw87E8K2216g6ZNo6vSGA7H1GH2voWwejJ4/k/cJug6dz2S402rRAKh2Wong1arYHSkVlQp3diiMa5FHAOSE+Cy09O2ZsaF9IXQYUtlW6AVXFrBEPYH2kvkaPXchh8VETMijo6tbvoKLnUHe+wTaDMls7hy8exjtVyI59r3DNzjy1lNGaGb5QSnFMXR+eHhPZc844Wv02MxC15zKABADrl58gpJyjTl6XpDdHCYGsmGpVGH3X9TQQKBgQDz/9beFjzq59ve6rGwn+EtnQfSsyYT+jr7GN8lNEXb3YOFXBgPhfFIcHRh2R00Vm9w2ApfAx2cd8xm2I6HuvQ1Os7g26LWazvuWY0Qzb+KaCLQTEGH1RnTq6CCG+BTRq/a3J8M4t38GV5TWlzv8wr9U4dl6FR4efjb65HXs1GQ4QKBgQC7/uHfrOTEHrLeIeqEuSl0vWNqEotFKdKLV6xpOvNuxDGbgW4/r/zaxDqt0YBOXmRbQYSEhmO3oy9J6XfE1SUln0gbavZeW0HESCAmUIC88bDnspUwS9RxauqT5aF8ODKN/bNCWCnBM1xyonPOs1oT1nyparJVdQoG//Y7vkB3+wKBgBqLqPq8fKAp3XfhHLfUjREDVoiLyQa/YI9U42IOz9LdxKNLo6p8rgVthpvmnRDGnpUuS+KOWjhdqDVANjF6G3t3DG7WNl8Rh5Gk2H4NhFswfSkgQrjebFLlBy9gjQVCWXt8KSmjvPbiY6q52Aaa8IUjA0YJAregvXxfopxO+/7BAoGARicvEtDp7WWnSc1OPoj6N14VIxgYcI7SyrzE0d/1x3ffKzB5e7qomNpxKzvqrVP8DzG7ydh8jaKPmv1MfF8tpYRy3AhmN3/GYwCnPqT75YYrhcrWcVdax5gmQVqHkFtIQkRSCIftzPLlpMGKha/YBV8c1fvC4LD0NPh/Ynv0gtECgYEAyOZg95/kte0jpgUEgwuMrzkhY/AaUJULFuR5MkyvReEbtSBQwV5tx60+T95PHNiFooWWVXiLMsAgyI2IbkxVR1Pzdri3gWK5CTfqb7kLuaj/B7SGvBa2Sxo478KS5K8tBBBWkITqo+wLC0mn3uZi1dyMWO1zopTA+KtEGF2dtGQ=";
         let private_key = STANDARD.decode(private_key).unwrap();
-        let private_key = SerializedBytes::<Pkcs8PrivateKeyDerContentFormat>::from(private_key);
+        let private_key = Bytes::<Pkcs8PrivateKeyDerContentFormat>::from(private_key);
         let private_key = AsymmetricCryptoKey::from_der(&private_key).unwrap();
         let decrypted: SymmetricCryptoKey =
             encrypted.decapsulate_key_unsigned(&private_key).unwrap();

crates/bitwarden-core/src/platform/generate_fingerprint.rs

@@ -3,7 +3,7 @@
 //! This module contains the logic for generating fingerprints.
 
 use base64::{engine::general_purpose::STANDARD, Engine};
-use bitwarden_crypto::{fingerprint, SerializedBytes, SpkiPublicKeyDerContentFormat};
+use bitwarden_crypto::{fingerprint, Bytes, SpkiPublicKeyDerContentFormat};
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
@@ -42,7 +42,7 @@ pub enum FingerprintError {
 
 pub(crate) fn generate_fingerprint(input: &FingerprintRequest) -> Result<String, FingerprintError> {
     let key = STANDARD.decode(&input.public_key)?;
-    let key = SerializedBytes::<SpkiPublicKeyDerContentFormat>::from(key);
+    let key = Bytes::<SpkiPublicKeyDerContentFormat>::from(key);
     Ok(fingerprint(&input.fingerprint_material, &key)?)
 }
 

crates/bitwarden-crypto/examples/signature.rs

@@ -2,7 +2,7 @@
 //! to verify them.
 
 use bitwarden_crypto::{
-    CoseSerializable, CoseSign1ContentFormat, SerializedBytes, SigningNamespace,
+    CoseSerializable, CoseSign1ContentFormat, Bytes, SigningNamespace,
 };
 use serde::{Deserialize, Serialize};
 
@@ -45,7 +45,7 @@ fn main() {
 
     // Bob retrieves the signed object from the server
     let retrieved_signature =
-        bitwarden_crypto::Signature::from_cose(&SerializedBytes::<CoseSign1ContentFormat>::from(
+        bitwarden_crypto::Signature::from_cose(&Bytes::<CoseSign1ContentFormat>::from(
             mock_server
                 .download("signature")
                 .expect("Failed to download signature")
@@ -93,15 +93,15 @@ fn main() {
             .expect("Failed to get content type from signature"),
     );
     let retrieved_alice_signature =
-        bitwarden_crypto::Signature::from_cose(&SerializedBytes::<CoseSign1ContentFormat>::from(
+        bitwarden_crypto::Signature::from_cose(&Bytes::<CoseSign1ContentFormat>::from(
             mock_server
                 .download("signature")
                 .expect("Failed to download Alice's signature")
                 .clone(),
         ))
         .expect("Failed to deserialize Alice's signature");
     let retrieved_bobs_signature =
-        bitwarden_crypto::Signature::from_cose(&SerializedBytes::<CoseSign1ContentFormat>::from(
+        bitwarden_crypto::Signature::from_cose(&Bytes::<CoseSign1ContentFormat>::from(
             mock_server
                 .download("bobs_signature")
                 .expect("Failed to download Bob's signature")

crates/bitwarden-crypto/examples/signed_object.rs

@@ -1,7 +1,7 @@
 //! This example demonstrates how to sign and verify structs.
 
 use bitwarden_crypto::{
-    CoseSerializable, CoseSign1ContentFormat, SerializedBytes, SignedObject, SigningNamespace,
+    Bytes, CoseSerializable, CoseSign1ContentFormat, SignedObject, SigningNamespace,
 };
 use serde::{Deserialize, Serialize};
 
@@ -39,14 +39,13 @@ fn main() {
     mock_server.upload("signed_object", signed_object.to_cose().as_ref().to_vec());
 
     // Bob retrieves the signed object from the server
-    let retrieved_signed_object =
-        SignedObject::from_cose(&SerializedBytes::<CoseSign1ContentFormat>::from(
-            mock_server
-                .download("signed_object")
-                .expect("Failed to download signed object")
-                .clone(),
-        ))
-        .expect("Failed to deserialize signed object");
+    let retrieved_signed_object = SignedObject::from_cose(&Bytes::<CoseSign1ContentFormat>::from(
+        mock_server
+            .download("signed_object")
+            .expect("Failed to download signed object")
+            .clone(),
+    ))
+    .expect("Failed to deserialize signed object");
     // Bob verifies the signed object using Alice's verifying key
     let verified_message: MessageToBob = retrieved_signed_object
         .verify_and_unwrap(&alice_verifying_key, EXAMPLE_NAMESPACE)

crates/bitwarden-crypto/src/content_format.rs

@@ -53,12 +53,12 @@ pub trait ConstContentFormat {
 /// format is used to determine how the bytes should be interpreted when encrypting or decrypting
 /// the data.
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub struct SerializedBytes<C: ConstContentFormat> {
+pub struct Bytes<C: ConstContentFormat> {
     inner: Vec<u8>,
     _marker: std::marker::PhantomData<C>,
 }
 
-impl<C: ConstContentFormat> From<Vec<u8>> for SerializedBytes<C> {
+impl<C: ConstContentFormat> From<Vec<u8>> for Bytes<C> {
     fn from(inner: Vec<u8>) -> Self {
         Self {
             inner,
@@ -67,19 +67,19 @@ impl<C: ConstContentFormat> From<Vec<u8>> for SerializedBytes<C> {
     }
 }
 
-impl<C: ConstContentFormat> From<&[u8]> for SerializedBytes<C> {
+impl<C: ConstContentFormat> From<&[u8]> for Bytes<C> {
     fn from(inner: &[u8]) -> Self {
         Self::from(inner.to_vec())
     }
 }
 
-impl<C: ConstContentFormat> AsRef<[u8]> for SerializedBytes<C> {
+impl<C: ConstContentFormat> AsRef<[u8]> for Bytes<C> {
     fn as_ref(&self) -> &[u8] {
         &self.inner
     }
 }
 
-impl<C: ConstContentFormat> SerializedBytes<C> {
+impl<C: ConstContentFormat> Bytes<C> {
     /// Returns the serialized bytes as a `Vec<u8>`.
     pub fn to_vec(&self) -> Vec<u8> {
         self.inner.clone()
@@ -156,7 +156,7 @@ impl CoseContentFormat for CoseSign1ContentFormat {}
 pub trait CoseContentFormat {}
 
 impl<Ids: KeyIds, T: ConstContentFormat> PrimitiveEncryptable<Ids, Ids::Symmetric, EncString>
-    for SerializedBytes<T>
+    for Bytes<T>
 {
     fn encrypt(
         &self,
@@ -167,20 +167,20 @@ impl<Ids: KeyIds, T: ConstContentFormat> PrimitiveEncryptable<Ids, Ids::Symmetri
     }
 }
 
-impl<T: ConstContentFormat> KeyEncryptable<SymmetricCryptoKey, EncString> for &SerializedBytes<T> {
+impl<T: ConstContentFormat> KeyEncryptable<SymmetricCryptoKey, EncString> for &Bytes<T> {
     fn encrypt_with_key(self, key: &SymmetricCryptoKey) -> Result<EncString, CryptoError> {
         self.as_ref().encrypt_with_key(key, T::content_format())
     }
 }
 
-impl From<String> for SerializedBytes<Utf8ContentFormat> {
+impl From<String> for Bytes<Utf8ContentFormat> {
     fn from(val: String) -> Self {
-        SerializedBytes::from(val.into_bytes())
+        Bytes::from(val.into_bytes())
     }
 }
 
-impl From<&str> for SerializedBytes<Utf8ContentFormat> {
+impl From<&str> for Bytes<Utf8ContentFormat> {
     fn from(val: &str) -> Self {
-        SerializedBytes::from(val.as_bytes().to_vec())
+        Bytes::from(val.as_bytes().to_vec())
     }
 }

crates/bitwarden-crypto/src/cose.rs

@@ -11,7 +11,7 @@ use generic_array::GenericArray;
 use typenum::U32;
 
 use crate::{
-    content_format::{ConstContentFormat, CoseContentFormat, SerializedBytes},
+    content_format::{ConstContentFormat, CoseContentFormat, Bytes},
     error::{EncStringParseError, EncodingError},
     xchacha20, ContentFormat, CryptoError, SymmetricCryptoKey, XChaCha20Poly1305Key,
 };
@@ -216,9 +216,9 @@ fn should_pad_content(format: &ContentFormat) -> bool {
 /// Trait for structs that are serializable to COSE objects.
 pub trait CoseSerializable<T: CoseContentFormat + ConstContentFormat> {
     /// Serializes the struct to COSE serialization
-    fn to_cose(&self) -> SerializedBytes<T>;
+    fn to_cose(&self) -> Bytes<T>;
     /// Deserializes a serialized COSE object to a struct
-    fn from_cose(bytes: &SerializedBytes<T>) -> Result<Self, EncodingError>
+    fn from_cose(bytes: &Bytes<T>) -> Result<Self, EncodingError>
     where
         Self: Sized;
 }

crates/bitwarden-crypto/src/enc_string/asymmetric.rs

@@ -11,7 +11,7 @@ use crate::{
     rsa::encrypt_rsa2048_oaep_sha1,
     util::FromStrVisitor,
     AsymmetricCryptoKey, AsymmetricPublicCryptoKey, BitwardenLegacyKeyContentFormat, RawPrivateKey,
-    RawPublicKey, SerializedBytes, SymmetricCryptoKey,
+    RawPublicKey, Bytes, SymmetricCryptoKey,
 };
 // This module is a workaround to avoid deprecated warnings that come from the ZeroizeOnDrop
 // macro expansion
@@ -218,7 +218,7 @@ impl UnsignedSharedKey {
                 }
                 .map_err(|_| CryptoError::KeyDecrypt)?;
                 SymmetricCryptoKey::try_from(
-                    &SerializedBytes::<BitwardenLegacyKeyContentFormat>::from(key_data),
+                    &Bytes::<BitwardenLegacyKeyContentFormat>::from(key_data),
                 )
             }
         }