Skip to content

Commit 88b96b7

Browse files
committed
Fix encryptable
1 parent 9b2f6c9 commit 88b96b7

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use crate::{
1515
/// The context of a crypto operation using [super::KeyStore]
1616
///
1717
/// This will usually be accessed from an implementation of [crate::Decryptable] or
18-
/// [crate::Encryptable], [crate::TypedEncryptable], but can also be obtained through
18+
/// [crate::Encryptable], [crate::PrimitiveEncryptableWithContentType], but can also be obtained through
1919
/// [super::KeyStore::context]
2020
///
2121
/// This context contains access to the user keys stored in the [super::KeyStore] (sometimes

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ impl<Ids: KeyIds> KeyStore<Ids> {
129129
/// context-local store will be cleared when the context is dropped.
130130
///
131131
/// If you are only looking to encrypt or decrypt items, you should implement
132-
/// [Encryptable]/[Decryptable] and use the [KeyStore::encrypt], [KeyStore::decrypt],
132+
/// [CompositeEncryptable]/[Decryptable] and use the [KeyStore::encrypt], [KeyStore::decrypt],
133133
/// [KeyStore::encrypt_list] and [KeyStore::decrypt_list] methods instead.
134134
///
135135
/// The current implementation of context only clears the keys automatically when the context is
@@ -143,10 +143,10 @@ impl<Ids: KeyIds> KeyStore<Ids> {
143143
/// future to also not be [Send].
144144
///
145145
/// Some other possible use cases for this API and alternative recommendations are:
146-
/// - Decrypting or encrypting multiple [Decryptable] or [Encryptable] items while sharing any
146+
/// - Decrypting or encrypting multiple [Decryptable] or [CompositeEncryptable] items while sharing any
147147
/// local keys. This is not recommended as it can lead to fragile and flaky
148148
/// decryption/encryption operations. We recommend any local keys to be used only in the
149-
/// context of a single [Encryptable] or [Decryptable] implementation. In the future we might
149+
/// context of a single [CompositeEncryptable] or [Decryptable] implementation. In the future we might
150150
/// enforce this.
151151
/// - Obtaining the key material directly. We strongly recommend against doing this as it can
152152
/// lead to key material being leaked, but we need to support it for backwards compatibility.
@@ -310,7 +310,7 @@ pub(crate) mod tests {
310310
use crate::{
311311
store::{KeyStore, KeyStoreContext},
312312
traits::tests::{TestIds, TestSymmKey},
313-
EncString, PrimitiveEncryptableWithContentType, SymmetricCryptoKey,
313+
EncString, SymmetricCryptoKey, PrimitiveEncryptableWithContentType,
314314
};
315315

316316
pub struct DataView(pub String, pub TestSymmKey);

0 commit comments

Comments
 (0)