Skip to content

Commit b231c5d

Browse files
authored
Merge pull request #85 from cipherstash/chore/update-client-dep
Updated to cipherstash-client 0.12.4, bumped version to 0.8.2
2 parents ee2085e + 2794dd3 commit b231c5d

File tree

8 files changed

+174
-38
lines changed

8 files changed

+174
-38
lines changed

Cargo.lock

Lines changed: 147 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ repository = "https://github.com/cipherstash/cipherstash-dynamodb"
66
documentation = "https://docs.rs/cipherstash-dynamodb"
77
readme = "README.md"
88
description = "CipherStash SDK for searchable, in-use encryption for DynamoDB"
9-
version = "0.8.1"
9+
version = "0.8.2"
1010
edition = "2021"
1111
authors = ["CipherStash <info@cipherstash.com>"]
1212
keywords = ["cryptography", "security", "databases", "encryption", "dynamodb"]
1313
categories = ["cryptography", "database"]
1414

1515
[dependencies]
16-
cipherstash-client = { version = "0.12" }
16+
cipherstash-client = { version = ">=0.12.4" }
1717
cipherstash-dynamodb-derive = { version = "0.8", path = "cipherstash-dynamodb-derive" }
1818

1919
aws-sdk-dynamodb = "1.3.0"

src/crypto/attrs/flattened_encrypted_attributes.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ use crate::{
55
};
66
use cipherstash_client::{
77
credentials::{service_credentials::ServiceToken, Credentials},
8-
encryption::{Encryption, EncryptionError},
9-
zero_kms::EncryptedRecord,
8+
encryption::Encryption,
9+
zerokms::EncryptedRecord,
1010
};
1111
use itertools::Itertools;
1212

@@ -61,7 +61,7 @@ impl FlattenedEncryptedAttributes {
6161
record
6262
.to_vec()
6363
.map(|data| (FlattenedAttrName::parse(&record.descriptor), data))
64-
.map_err(EncryptionError::from)
64+
.map_err(|_| SealError::AssertionFailed("Decryption failed".to_string()))
6565
})
6666
.fold_ok(
6767
Ok(TableAttributes::new()),

src/crypto/mod.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use cipherstash_client::{
1313
compound_indexer::{CompoundIndex, ExactIndex},
1414
Encryption, EncryptionError, Plaintext, TypeParseError,
1515
},
16-
vitur_client::DecryptError,
16+
zerokms::Error as ZeroKmsError,
1717
};
1818
use miette::Diagnostic;
1919
use std::borrow::Cow;
@@ -49,10 +49,11 @@ pub enum SealError {
4949

5050
// Note that we don't expose the specific error type here
5151
// so as to avoid leaking any information
52-
#[error("Encryption failed")]
52+
#[error(transparent)]
5353
EncryptionError(#[from] EncryptionError),
54-
#[error("Decryption failed")]
55-
DecryptionError(#[from] DecryptError),
54+
55+
#[error(transparent)]
56+
ZeroKmsError(#[from] ZeroKmsError),
5657
}
5758

5859
#[derive(Error, Debug)]

0 commit comments

Comments
 (0)