Skip to content

Commit c3a280c

Browse files
authored
Merge pull request #14 from cipherstash/decrypt-trait
Decrypt trait derivation, trait improvements and improved encryption operations
2 parents e7dda59 + 8a8df24 commit c3a280c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1538
-901
lines changed

.DS_Store

-6 KB
Binary file not shown.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
.rtx.toml
33
.envrc
44
.env
5+
.DS_Store

Cargo.lock

Lines changed: 12 additions & 32 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 & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,11 @@ tracing = { version = "0.1", features = ["log"] }
2828
tracing-subscriber = { version = "0.3", default-features = false, features = ["fmt"] }
2929
hmac = "0.12.1"
3030
sha2 = "0.10.7"
31-
serde = "1.0.183"
32-
serde_dynamo = { version = "4.2.4", features = ["aws-sdk-dynamodb+0_29"] }
33-
serde_bytes = "0.11.9"
3431
aes = "0.8.3"
3532
hex = { version = "0.4.3", features = [ "serde" ] }
3633
cryptonamo-derive = { path = "cryptonamo-derive" }
3734

35+
# cipherstash-client = { path = "../../cipherstash-suite/packages/cipherstash-client/", features = [ "tokio" ] }
3836
cipherstash-client = { path = "./vendor/cipherstash-client/", features = [ "tokio" ] }
3937
# cipherstash-client = { git = "ssh://git@github.com/cipherstash/cipherstash-suite.git", branch = "feat/compound-spike", package = "cipherstash-client", features = [ "tokio" ] }
4038

@@ -45,6 +43,7 @@ env_logger = "0.10.0"
4543
itertools = "0.11.0"
4644
thiserror = "1.0.50"
4745
tokio-stream = "0.1.14"
46+
paste = "1.0.14"
4847

4948
[dev-dependencies]
5049
serial_test = "2.0.0"

0 commit comments

Comments
 (0)