diff --git a/Cargo.lock b/Cargo.lock index cfd6a4bc..aacc5873 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -673,9 +673,9 @@ dependencies = [ [[package]] name = "cipherstash-client" -version = "0.10.0" +version = "0.12.0" source = "sparse+https://cargo.cloudsmith.io/cipherstash/cipherstash/" -checksum = "70b1e97490a4c0955ac7c8f9ba3484408c22c62c619179bab95dc86005d25a1a" +checksum = "648b9f57179b0d6a949a097aaba5603188211dc2f8f1cd980f5cbe6cb0414753" dependencies = [ "aes-gcm-siv", "anyhow", @@ -684,7 +684,6 @@ dependencies = [ "base64 0.22.1", "cfg-if", "chrono", - "cipherstash-config", "cipherstash-core", "cipherstash-stats", "dirs", @@ -720,9 +719,9 @@ dependencies = [ [[package]] name = "cipherstash-config" -version = "0.1.0" +version = "0.2.0" source = "sparse+https://cargo.cloudsmith.io/cipherstash/cipherstash/" -checksum = "7d20ddb4dc9319bb932fd32775cd6895d5d49bf5dbd53a5051d8745fd542f2ce" +checksum = "d0fc6810f2b0b2f41de31691851ffd553b6b0f96097044f41b690b579884fb2f" dependencies = [ "serde", "thiserror", @@ -3126,9 +3125,9 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vitur-protocol" -version = "0.2.0" +version = "0.2.1" source = "sparse+https://cargo.cloudsmith.io/cipherstash/cipherstash/" -checksum = "174592d9c0a0f727a1d1aaa8c22eee5ad58eb27b5fa0eb48eca8e42cff1d7240" +checksum = "8cc735d28f9cc5dc09a3ff60ee5d7969cf170c2e9424981808a8b9cf2ea2551e" dependencies = [ "async-trait", "base64 0.22.1", diff --git a/Cargo.toml b/Cargo.toml index 5be7d9d3..d58050af 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ repository = "https://github.com/cipherstash/cipherstash-dynamodb" # and it will keep the alphabetic ordering for you. [dependencies] -cipherstash-client = { version = "0.10", registry = "cipherstash" } +cipherstash-client = { version = "0.12", registry = "cipherstash" } cipherstash-dynamodb-derive = { version = "0.7", path = "cipherstash-dynamodb-derive", registry = "cipherstash" } aws-sdk-dynamodb = "1.3.0" diff --git a/cipherstash-dynamodb-derive/src/searchable.rs b/cipherstash-dynamodb-derive/src/searchable.rs index 9f685ad6..c6fcf35b 100644 --- a/cipherstash-dynamodb-derive/src/searchable.rs +++ b/cipherstash-dynamodb-derive/src/searchable.rs @@ -57,7 +57,7 @@ pub(crate) fn derive_searchable(input: DeriveInput) -> Result Option> { + fn index_by_name(index_name: &str, index_type: cipherstash_dynamodb::IndexType) -> Option> { match ( index_name, index_type ) { #(#indexes_impl,)* _ => None, diff --git a/src/crypto/sealer.rs b/src/crypto/sealer.rs index 919eaa8f..3e958b68 100644 --- a/src/crypto/sealer.rs +++ b/src/crypto/sealer.rs @@ -19,7 +19,7 @@ use std::{borrow::Cow, collections::HashMap, ops::Deref}; /// The combination of plaintext, index, name and index type for a particular field pub type UnsealedIndex = ( ComposablePlaintext, - Box, + Box, Cow<'static, str>, IndexType, ); diff --git a/src/encrypted_table/query.rs b/src/encrypted_table/query.rs index d2a1c4af..6da2a5f6 100644 --- a/src/encrypted_table/query.rs +++ b/src/encrypted_table/query.rs @@ -26,7 +26,7 @@ pub struct QueryBuilder { pub struct PreparedQuery { index_name: String, type_name: String, - composed_index: Box, + composed_index: Box, plaintext: ComposablePlaintext, } @@ -161,7 +161,7 @@ where pub struct PreparedQueryBuilder { pub type_name: Cow<'static, str>, - pub index_by_name: fn(&str, IndexType) -> Option>, + pub index_by_name: fn(&str, IndexType) -> Option>, } impl PreparedQueryBuilder { diff --git a/src/traits/mod.rs b/src/traits/mod.rs index 8d0e3028..21f69b9d 100644 --- a/src/traits/mod.rs +++ b/src/traits/mod.rs @@ -126,7 +126,7 @@ pub trait Searchable: Encryptable { fn index_by_name( _index_name: &str, _index_type: IndexType, - ) -> Option> { + ) -> Option> { None } }