chore: fixup cipherstash-client usages

Author: freshtonic

Cargo.lock

@@ -24,12 +24,8 @@ tracing-subscriber = { workspace = true }
 webpki-roots = "0.26.7"
 
 [dev-dependencies]
-# cipherstash-client = { version = "0.18.0-pre.1", features = ["tokio"] }
-cipherstash-client = { path = "../../../cipherstash-suite/packages/cipherstash-client", features = [
-    "tokio",
-] }
-# cipherstash-config = "0.2.3"
-cipherstash-config = { path = "../../../cipherstash-suite/packages/cipherstash-config" }
+cipherstash-client = { version = "0.20.0", features = ["tokio"] }
+cipherstash-config = "0.2.3"
 clap = "4.5.32"
 fake = { version = "4", features = ["chrono", "derive"] }
 hex = "0.4.3"

packages/cipherstash-proxy-integration/Cargo.toml

@@ -189,7 +189,7 @@ mod tests {
         let mut result = pipeline.encrypt(None).await.unwrap();
         if let Some(Encrypted::SteVec(ste_vec)) = result.remove(idx) {
             for entry in ste_vec {
-                let selector = hex::encode(entry.0 .0);
+                let selector = hex::encode(entry.0.as_bytes());
                 let term = entry.1;
                 let record = entry.2;
 
@@ -200,10 +200,10 @@ mod tests {
                         e.blake3_index = Some(hex::encode(&items));
                     }
                     EncryptedSteVecTerm::OreFixed(o) => {
-                        e.ore_cclw_fixed_index = Some(hex::encode(o.bytes));
+                        e.ore_cclw_fixed_index = Some(hex::encode(&o));
                     }
                     EncryptedSteVecTerm::OreVariable(o) => {
-                        e.ore_cclw_var_index = Some(hex::encode(o.bytes));
+                        e.ore_cclw_var_index = Some(hex::encode(&o));
                     }
                 }
 

packages/cipherstash-proxy-integration/src/generate.rs

@@ -1,7 +1,6 @@
 mod common;
 mod empty_result;
 mod extended_protocol_error_messages;
-mod generate;
 mod map_concat;
 mod map_literals;
 mod map_match_index;

packages/cipherstash-proxy-integration/src/lib.rs

@@ -8,12 +8,8 @@ bigdecimal = { version = "0.4.6", features = ["serde-json"] }
 arc-swap = "1.7.1"
 bytes = { version = "1.9", default-features = false }
 chrono = { version = "0.4.39", features = ["clock"] }
-# cipherstash-client = { version = "0.18.0-pre.1", features = ["tokio"] }
-cipherstash-client = { path = "../../../cipherstash-suite/packages/cipherstash-client", features = [
-    "tokio",
-] }
-# cipherstash-config = "0.2.3"
-cipherstash-config = { path = "../../../cipherstash-suite/packages/cipherstash-config" }
+cipherstash-client = { version = "0.20.0", features = ["tokio"] }
+cipherstash-config = "0.2.3"
 clap = { version = "4.5.31", features = ["derive", "env"] }
 config = { version = "0.15", features = [
     "async",

packages/cipherstash-proxy/Cargo.toml

@@ -260,15 +260,15 @@ fn to_eql_encrypted(
                     }
                     IndexTerm::BinaryVec(_) => todo!(),
                     IndexTerm::SteVecSelector(s) => {
-                        selector = Some(hex::encode(s.0));
+                        selector = Some(hex::encode(s.as_bytes()));
                     }
                     IndexTerm::SteVecTerm(ste_vec_term) => match ste_vec_term {
                         EncryptedSteVecTerm::Mac(bytes) => blake3_index = Some(hex::encode(bytes)),
                         EncryptedSteVecTerm::OreFixed(ore) => {
-                            ore_cclw_fixed_index = Some(hex::encode(ore.bytes))
+                            ore_cclw_fixed_index = Some(hex::encode(&ore))
                         }
                         EncryptedSteVecTerm::OreVariable(ore) => {
-                            ore_cclw_var_index = Some(hex::encode(ore.bytes))
+                            ore_cclw_var_index = Some(hex::encode(&ore))
                         }
                     },
                     IndexTerm::SteQueryVec(_query) => {} // TODO: what do we do here?
@@ -302,18 +302,18 @@ fn to_eql_encrypted(
                 .map(|EncryptedEntry(selector, term, ciphertext)| {
                     let indexes = match term {
                         EncryptedSteVecTerm::Mac(bytes) => EqlEncryptedIndexes {
-                            selector: Some(hex::encode(selector.0)),
+                            selector: Some(hex::encode(selector.as_bytes())),
                             blake3_index: Some(hex::encode(bytes)),
                             ..Default::default()
                         },
                         EncryptedSteVecTerm::OreFixed(ore) => EqlEncryptedIndexes {
-                            selector: Some(hex::encode(selector.0)),
-                            ore_cclw_fixed_index: Some(hex::encode(ore.bytes)),
+                            selector: Some(hex::encode(selector.as_bytes())),
+                            ore_cclw_fixed_index: Some(hex::encode(&ore)),
                             ..Default::default()
                         },
                         EncryptedSteVecTerm::OreVariable(ore) => EqlEncryptedIndexes {
-                            selector: Some(hex::encode(selector.0)),
-                            ore_cclw_var_index: Some(hex::encode(ore.bytes)),
+                            selector: Some(hex::encode(selector.as_bytes())),
+                            ore_cclw_var_index: Some(hex::encode(&ore)),
                             ..Default::default()
                         },
                     };