Cargo fmt

Author: quexten

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

@@ -8,7 +8,8 @@ use std::collections::HashMap;
 
 use base64::{engine::general_purpose::STANDARD, Engine};
 use bitwarden_crypto::{
-    AsymmetricCryptoKey, CryptoError, EncString, Kdf, KeyDecryptable, KeyEncryptable, MasterKey, SymmetricCryptoKey, UnsignedSharedKey, UserKey
+    AsymmetricCryptoKey, CryptoError, EncString, Kdf, KeyDecryptable, KeyEncryptable, MasterKey,
+    SymmetricCryptoKey, UnsignedSharedKey, UserKey,
 };
 use serde::{Deserialize, Serialize};
 #[cfg(feature = "wasm")]

crates/bitwarden-crypto/src/cose.rs

@@ -3,34 +3,35 @@
 //! unless there is a a clear benefit, such as a clear cryptographic benefit, which MUST
 //! be documented publicly.
 
-use coset::{iana::{self, CoapContentFormat}, CborSerializable, Label};
+use coset::{
+    iana::{self, CoapContentFormat},
+    CborSerializable, Label,
+};
 use generic_array::GenericArray;
+use serde::{Deserialize, Serialize};
+#[cfg(feature = "wasm")]
+use tsify_next::Tsify;
 use typenum::U32;
 
 use crate::{
     error::EncStringParseError, xchacha20, CryptoError, SymmetricCryptoKey, XChaCha20Poly1305Key,
 };
 
-use serde::{Deserialize, Serialize};
-#[cfg(feature = "wasm")]
-use tsify_next::Tsify;
-
 /// XChaCha20 <https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-xchacha-03> is used over ChaCha20
 /// to be able to randomly generate nonces, and to not have to worry about key wearout. Since
 /// the draft was never published as an RFC, we use a private-use value for the algorithm.
 pub(crate) const XCHACHA20_POLY1305: i64 = -70000;
 const XCHACHA20_TEXT_PAD_BLOCK_SIZE: usize = 32;
 
-
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
 #[cfg_attr(feature = "wasm", derive(Tsify), tsify(into_wasm_abi, from_wasm_abi))]
 pub enum ContentFormat {
     Utf8,
     Pkcs8,
     CoseKey,
     OctetStream,
-    /// Domain object should never be serialized. It is used to indicate when we call an encrypt operation
-    /// on a complex object that consists of multiple, individually encrypted fields
+    /// Domain object should never be serialized. It is used to indicate when we call an encrypt
+    /// operation on a complex object that consists of multiple, individually encrypted fields
     DomainObject,
 }
 
@@ -49,11 +50,14 @@ pub(crate) fn encrypt_xchacha20_poly1305(
 ) -> Result<Vec<u8>, CryptoError> {
     let protected_header = coset::HeaderBuilder::new();
     let protected_header = match content_format {
-        // UTF-8 directly would leak the plaintext size. This is not acceptable for certain data (passwords).
+        // UTF-8 directly would leak the plaintext size. This is not acceptable for certain data
+        // (passwords).
         ContentFormat::Utf8 => protected_header.content_type("application/utf8-padded".to_string()),
         ContentFormat::Pkcs8 => protected_header.content_format(CoapContentFormat::Pkcs8),
         ContentFormat::CoseKey => protected_header.content_format(CoapContentFormat::CoseKey),
-        ContentFormat::OctetStream => protected_header.content_format(CoapContentFormat::OctetStream),
+        ContentFormat::OctetStream => {
+            protected_header.content_format(CoapContentFormat::OctetStream)
+        }
         // This should panic, and should never be implemented to be reachable!
         ContentFormat::DomainObject => unreachable!(),
     };
@@ -170,7 +174,8 @@ mod test {
         };
 
         let plaintext = b"Hello, world!";
-        let encrypted = encrypt_xchacha20_poly1305(plaintext, key, &ContentFormat::OctetStream).unwrap();
+        let encrypted =
+            encrypt_xchacha20_poly1305(plaintext, key, &ContentFormat::OctetStream).unwrap();
         let decrypted = decrypt_xchacha20_poly1305(&encrypted, key).unwrap();
         assert_eq!(decrypted, plaintext);
     }

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

@@ -6,7 +6,9 @@ use serde::Deserialize;
 
 use super::{check_length, from_b64, from_b64_vec, split_enc_string};
 use crate::{
-    error::{CryptoError, EncStringParseError, Result, UnsupportedOperation}, Aes256CbcHmacKey, ContentFormat, KeyDecryptable, KeyEncryptable, SymmetricCryptoKey, XChaCha20Poly1305Key
+    error::{CryptoError, EncStringParseError, Result, UnsupportedOperation},
+    Aes256CbcHmacKey, ContentFormat, KeyDecryptable, KeyEncryptable, SymmetricCryptoKey,
+    XChaCha20Poly1305Key,
 };
 
 #[cfg(feature = "wasm")]
@@ -349,7 +351,8 @@ mod tests {
 
     use super::EncString;
     use crate::{
-        derive_symmetric_key, ContentFormat, CryptoError, KeyDecryptable, KeyEncryptable, SymmetricCryptoKey, KEY_ID_SIZE
+        derive_symmetric_key, ContentFormat, CryptoError, KeyDecryptable, KeyEncryptable,
+        SymmetricCryptoKey, KEY_ID_SIZE,
     };
 
     #[test]
@@ -362,7 +365,10 @@ mod tests {
         });
 
         let test_string = "encrypted_test_string";
-        let cipher = test_string.to_owned().encrypt_with_key(&key, &ContentFormat::Utf8).unwrap();
+        let cipher = test_string
+            .to_owned()
+            .encrypt_with_key(&key, &ContentFormat::Utf8)
+            .unwrap();
         let decrypted_str: String = cipher.decrypt_with_key(&key).unwrap();
         assert_eq!(decrypted_str, test_string);
     }
@@ -372,7 +378,10 @@ mod tests {
         let key = SymmetricCryptoKey::Aes256CbcHmacKey(derive_symmetric_key("test"));
 
         let test_string = "encrypted_test_string";
-        let cipher = test_string.to_string().encrypt_with_key(&key, &ContentFormat::Utf8).unwrap();
+        let cipher = test_string
+            .to_string()
+            .encrypt_with_key(&key, &ContentFormat::Utf8)
+            .unwrap();
 
         let decrypted_str: String = cipher.decrypt_with_key(&key).unwrap();
         assert_eq!(decrypted_str, test_string);
@@ -383,7 +392,10 @@ mod tests {
         let key = SymmetricCryptoKey::Aes256CbcHmacKey(derive_symmetric_key("test"));
 
         let test_string: &'static str = "encrypted_test_string";
-        let cipher = test_string.to_string().encrypt_with_key(&key, &ContentFormat::Utf8).unwrap();
+        let cipher = test_string
+            .to_string()
+            .encrypt_with_key(&key, &ContentFormat::Utf8)
+            .unwrap();
 
         let decrypted_str: String = cipher.decrypt_with_key(&key).unwrap();
         assert_eq!(decrypted_str, test_string);

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

@@ -1,7 +1,5 @@
 mod key_encryptable;
-pub use key_encryptable::{
-    CryptoKey, KeyContainer, KeyDecryptable, KeyEncryptable,
-};
+pub use key_encryptable::{CryptoKey, KeyContainer, KeyDecryptable, KeyEncryptable};
 mod master_key;
 pub use master_key::{HashPurpose, MasterKey};
 mod shareable_key;

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

@@ -4,7 +4,8 @@ use super::{
     utils::stretch_key,
 };
 use crate::{
-    keys::key_encryptable::CryptoKey, ContentFormat, EncString, KeyEncryptable, Result, SymmetricCryptoKey
+    keys::key_encryptable::CryptoKey, ContentFormat, EncString, KeyEncryptable, Result,
+    SymmetricCryptoKey,
 };
 
 /// Pin Key.

crates/bitwarden-crypto/src/store/context.rs

@@ -7,7 +7,9 @@ use zeroize::Zeroizing;
 
 use super::KeyStoreInner;
 use crate::{
-    derive_shareable_key, error::UnsupportedOperation, store::backend::StoreBackend, AsymmetricCryptoKey, ContentFormat, CryptoError, EncString, KeyId, KeyIds, Result, SymmetricCryptoKey, UnsignedSharedKey
+    derive_shareable_key, error::UnsupportedOperation, store::backend::StoreBackend,
+    AsymmetricCryptoKey, ContentFormat, CryptoError, EncString, KeyId, KeyIds, Result,
+    SymmetricCryptoKey, UnsignedSharedKey,
 };
 
 /// The context of a crypto operation using [super::KeyStore]
@@ -180,7 +182,7 @@ impl<Ids: KeyIds> KeyStoreContext<'_, Ids> {
                 .encrypt_data_with_symmetric_key(
                     wrapping_key,
                     key_to_wrap_instance.to_encoded().as_slice(),
-                    ContentFormat::OctetStream
+                    ContentFormat::OctetStream,
                 ),
             _ => Err(CryptoError::OperationNotSupported(
                 UnsupportedOperation::EncryptionNotImplementedForKey,

crates/bitwarden-exporters/src/encrypted_json.rs

@@ -57,8 +57,12 @@ pub(crate) fn export_encrypted_json(
         kdf_iterations,
         kdf_memory,
         kdf_parallelism,
-        enc_key_validation: enc_key_validation.encrypt_with_key(&key, &ContentFormat::Utf8)?.to_string(),
-        data: decrypted_export.encrypt_with_key(&key, &ContentFormat::Utf8)?.to_string(),
+        enc_key_validation: enc_key_validation
+            .encrypt_with_key(&key, &ContentFormat::Utf8)?
+            .to_string(),
+        data: decrypted_export
+            .encrypt_with_key(&key, &ContentFormat::Utf8)?
+            .to_string(),
     };
 
     Ok(serde_json::to_string_pretty(&encrypted_export)?)

crates/bitwarden-vault/src/cipher/attachment.rs

@@ -1,6 +1,6 @@
 use bitwarden_core::key_management::{KeyIds, SymmetricKeyId};
 use bitwarden_crypto::{
-    ContentFormat, CryptoError, Decryptable, EncString, Encryptable, IdentifyKey, KeyStoreContext
+    ContentFormat, CryptoError, Decryptable, EncString, Encryptable, IdentifyKey, KeyStoreContext,
 };
 use serde::{Deserialize, Serialize};
 #[cfg(feature = "wasm")]

crates/bitwarden-vault/src/cipher/card.rs

@@ -1,6 +1,8 @@
 use bitwarden_api_api::models::CipherCardModel;
 use bitwarden_core::key_management::{KeyIds, SymmetricKeyId};
-use bitwarden_crypto::{ContentFormat, CryptoError, Decryptable, EncString, Encryptable, KeyStoreContext};
+use bitwarden_crypto::{
+    ContentFormat, CryptoError, Decryptable, EncString, Encryptable, KeyStoreContext,
+};
 use serde::{Deserialize, Serialize};
 #[cfg(feature = "wasm")]
 use tsify_next::Tsify;

crates/bitwarden-vault/src/cipher/cipher.rs

@@ -4,7 +4,7 @@ use bitwarden_core::{
     require, MissingFieldError, VaultLockedError,
 };
 use bitwarden_crypto::{
-    ContentFormat, CryptoError, Decryptable, EncString, Encryptable, IdentifyKey, KeyStoreContext
+    ContentFormat, CryptoError, Decryptable, EncString, Encryptable, IdentifyKey, KeyStoreContext,
 };
 use bitwarden_error::bitwarden_error;
 use chrono::{DateTime, Utc};

crates/bitwarden-vault/src/cipher/field.rs

@@ -3,7 +3,9 @@ use bitwarden_core::{
     key_management::{KeyIds, SymmetricKeyId},
     require,
 };
-use bitwarden_crypto::{ContentFormat, CryptoError, Decryptable, EncString, Encryptable, KeyStoreContext};
+use bitwarden_crypto::{
+    ContentFormat, CryptoError, Decryptable, EncString, Encryptable, KeyStoreContext,
+};
 use serde::{Deserialize, Serialize};
 use serde_repr::{Deserialize_repr, Serialize_repr};
 #[cfg(feature = "wasm")]

crates/bitwarden-vault/src/cipher/identity.rs

@@ -1,6 +1,8 @@
 use bitwarden_api_api::models::CipherIdentityModel;
 use bitwarden_core::key_management::{KeyIds, SymmetricKeyId};
-use bitwarden_crypto::{ContentFormat, CryptoError, Decryptable, EncString, Encryptable, KeyStoreContext};
+use bitwarden_crypto::{
+    ContentFormat, CryptoError, Decryptable, EncString, Encryptable, KeyStoreContext,
+};
 use serde::{Deserialize, Serialize};
 #[cfg(feature = "wasm")]
 use tsify_next::Tsify;

crates/bitwarden-vault/src/cipher/ssh_key.rs

@@ -1,5 +1,7 @@
 use bitwarden_core::key_management::{KeyIds, SymmetricKeyId};
-use bitwarden_crypto::{ContentFormat, CryptoError, Decryptable, EncString, Encryptable, KeyStoreContext};
+use bitwarden_crypto::{
+    ContentFormat, CryptoError, Decryptable, EncString, Encryptable, KeyStoreContext,
+};
 use serde::{Deserialize, Serialize};
 #[cfg(feature = "wasm")]
 use tsify_next::Tsify;

crates/bitwarden-wasm-internal/src/pure_crypto.rs

@@ -1,7 +1,8 @@
 use std::str::FromStr;
 
 use bitwarden_crypto::{
-    ContentFormat, CryptoError, EncString, Kdf, KeyDecryptable, KeyEncryptable, MasterKey, SymmetricCryptoKey,
+    ContentFormat, CryptoError, EncString, Kdf, KeyDecryptable, KeyEncryptable, MasterKey,
+    SymmetricCryptoKey,
 };
 use wasm_bindgen::prelude::*;
 
@@ -52,15 +53,17 @@ impl PureCrypto {
     }
 
     pub fn symmetric_encrypt_string(plain: String, key: Vec<u8>) -> Result<String, CryptoError> {
-        plain.encrypt_with_key(
-            &SymmetricCryptoKey::try_from(key)?,
-            &ContentFormat::Utf8
-        ).map(|enc| enc.to_string())
+        plain
+            .encrypt_with_key(&SymmetricCryptoKey::try_from(key)?, &ContentFormat::Utf8)
+            .map(|enc| enc.to_string())
     }
 
     pub fn symmetric_encrypt_bytes(plain: Vec<u8>, key: Vec<u8>) -> Result<String, CryptoError> {
         plain
-            .encrypt_with_key(&SymmetricCryptoKey::try_from(key)?, &ContentFormat::OctetStream)
+            .encrypt_with_key(
+                &SymmetricCryptoKey::try_from(key)?,
+                &ContentFormat::OctetStream,
+            )
             .map(|enc| enc.to_string())
     }
 
@@ -69,7 +72,10 @@ impl PureCrypto {
         key: Vec<u8>,
     ) -> Result<Vec<u8>, CryptoError> {
         plain
-            .encrypt_with_key(&SymmetricCryptoKey::try_from(key)?, &ContentFormat::OctetStream)?
+            .encrypt_with_key(
+                &SymmetricCryptoKey::try_from(key)?,
+                &ContentFormat::OctetStream,
+            )?
             .to_buffer()
     }