Rename to primitiveencryptablewithcontenttype

Author: quexten

bitwarden_license/bitwarden-sm/src/projects/create.rs

@@ -1,6 +1,6 @@
 use bitwarden_api_api::models::ProjectCreateRequestModel;
 use bitwarden_core::{key_management::SymmetricKeyId, Client};
-use bitwarden_crypto::TypedEncryptable;
+use bitwarden_crypto::PrimitiveEncryptableWithContentType;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;

bitwarden_license/bitwarden-sm/src/projects/update.rs

@@ -1,6 +1,6 @@
 use bitwarden_api_api::models::ProjectUpdateRequestModel;
 use bitwarden_core::{key_management::SymmetricKeyId, Client};
-use bitwarden_crypto::TypedEncryptable;
+use bitwarden_crypto::PrimitiveEncryptableWithContentType;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;

bitwarden_license/bitwarden-sm/src/secrets/create.rs

@@ -1,6 +1,6 @@
 use bitwarden_api_api::models::SecretCreateRequestModel;
 use bitwarden_core::{key_management::SymmetricKeyId, Client};
-use bitwarden_crypto::TypedEncryptable;
+use bitwarden_crypto::PrimitiveEncryptableWithContentType;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;

bitwarden_license/bitwarden-sm/src/secrets/update.rs

@@ -1,6 +1,6 @@
 use bitwarden_api_api::models::SecretUpdateRequestModel;
 use bitwarden_core::{key_management::SymmetricKeyId, Client};
-use bitwarden_crypto::TypedEncryptable;
+use bitwarden_crypto::PrimitiveEncryptableWithContentType;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;

crates/bitwarden-crypto/src/lib.rs

@@ -35,7 +35,8 @@ mod traits;
 pub use cose::ContentFormat;
 mod xchacha20;
 pub use traits::{
-    CompositeEncryptable, Decryptable, Encryptable, IdentifyKey, KeyId, KeyIds, TypedEncryptable,
+    CompositeEncryptable, Decryptable, Encryptable, IdentifyKey, KeyId, KeyIds,
+    PrimitiveEncryptableWithContentType,
 };
 pub use zeroizing_alloc::ZeroAlloc as ZeroizingAllocator;
 

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

@@ -15,7 +15,8 @@ use crate::{
 /// The context of a crypto operation using [super::KeyStore]
 ///
 /// This will usually be accessed from an implementation of [crate::Decryptable] or
-/// [crate::Encryptable], [crate::TypedEncryptable], but can also be obtained through [super::KeyStore::context]
+/// [crate::Encryptable], [crate::TypedEncryptable], but can also be obtained through
+/// [super::KeyStore::context]
 ///
 /// This context contains access to the user keys stored in the [super::KeyStore] (sometimes
 /// referred to as `global keys`) and it also contains it's own individual secure backend for key

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

@@ -310,7 +310,7 @@ pub(crate) mod tests {
     use crate::{
         store::{KeyStore, KeyStoreContext},
         traits::tests::{TestIds, TestSymmKey},
-        EncString, SymmetricCryptoKey, TypedEncryptable,
+        EncString, PrimitiveEncryptableWithContentType, SymmetricCryptoKey,
     };
 
     pub struct DataView(pub String, pub TestSymmKey);

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

@@ -43,12 +43,12 @@ impl<Ids: KeyIds, Key: KeyId, T: CompositeEncryptable<Ids, Key, Output>, Output>
 
 /// An encryption operation that takes the input value - a primitive such as `String` and encrypts
 /// it into the output value. The implementation decides the content format.
-pub trait TypedEncryptable<Ids: KeyIds, Key: KeyId, Output> {
+pub trait PrimitiveEncryptableWithContentType<Ids: KeyIds, Key: KeyId, Output> {
     fn encrypt(&self, ctx: &mut KeyStoreContext<Ids>, key: Key) -> Result<Output, CryptoError>;
 }
 
-impl<Ids: KeyIds, Key: KeyId, T: TypedEncryptable<Ids, Key, Output>, Output>
-    TypedEncryptable<Ids, Key, Option<Output>> for Option<T>
+impl<Ids: KeyIds, Key: KeyId, T: PrimitiveEncryptableWithContentType<Ids, Key, Output>, Output>
+    PrimitiveEncryptableWithContentType<Ids, Key, Option<Output>> for Option<T>
 {
     fn encrypt(
         &self,
@@ -61,7 +61,7 @@ impl<Ids: KeyIds, Key: KeyId, T: TypedEncryptable<Ids, Key, Output>, Output>
     }
 }
 
-impl<Ids: KeyIds> TypedEncryptable<Ids, Ids::Symmetric, EncString> for &str {
+impl<Ids: KeyIds> PrimitiveEncryptableWithContentType<Ids, Ids::Symmetric, EncString> for &str {
     fn encrypt(
         &self,
         ctx: &mut KeyStoreContext<Ids>,
@@ -71,7 +71,7 @@ impl<Ids: KeyIds> TypedEncryptable<Ids, Ids::Symmetric, EncString> for &str {
     }
 }
 
-impl<Ids: KeyIds> TypedEncryptable<Ids, Ids::Symmetric, EncString> for String {
+impl<Ids: KeyIds> PrimitiveEncryptableWithContentType<Ids, Ids::Symmetric, EncString> for String {
     fn encrypt(
         &self,
         ctx: &mut KeyStoreContext<Ids>,
@@ -148,7 +148,7 @@ impl<Ids: KeyIds, Key: KeyId, T: Encryptable<Ids, Key, Output>, Output>
 mod tests {
     use crate::{
         cose::ContentFormat, traits::tests::*, AsymmetricCryptoKey, Decryptable, Encryptable,
-        KeyStore, SymmetricCryptoKey, TypedEncryptable,
+        KeyStore, PrimitiveEncryptableWithContentType, SymmetricCryptoKey,
     };
 
     fn test_store() -> KeyStore<TestIds> {

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

@@ -1,5 +1,5 @@
 mod encryptable;
-pub use encryptable::{CompositeEncryptable, Encryptable, TypedEncryptable};
+pub use encryptable::{CompositeEncryptable, Encryptable, PrimitiveEncryptableWithContentType};
 mod decryptable;
 pub use decryptable::Decryptable;
 

crates/bitwarden-send/src/send.rs

@@ -9,7 +9,7 @@ use bitwarden_core::{
 };
 use bitwarden_crypto::{
     generate_random_bytes, CompositeEncryptable, ContentFormat, CryptoError, Decryptable,
-    EncString, Encryptable, IdentifyKey, KeyStoreContext, TypedEncryptable,
+    EncString, Encryptable, IdentifyKey, KeyStoreContext, PrimitiveEncryptableWithContentType,
 };
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};