Merge pull request #1262 from cipherstash/feat/typed-control-messages

refactor: read control messages from frames with serde, not FfiValue (part 1: options and stats)

Author: coderdan

.cargo/mutants.toml

@@ -96,6 +96,17 @@ exclude_re = [
   # `true` there refuses the same values with the same error. The guard stays
   # so the model says what it holds without leaning on the writer behind it.
   'stack-encrypt/src/dynamic/value_frame\.rs:\d+:\d+: replace match guard logical\.admits\(&value\) with true in model$',
+  # A serde visitor's `expecting` writes only the "expected ..." half of a
+  # serde error's message, and no caller of these three reads that message:
+  # a context, statistics and a plan's root are each refused with one fixed
+  # `Reason` (`ContextKind`, `NotStats`, `NotAnObject`), and the plan's
+  # field-level reasons are read from the error's path, so writing nothing
+  # refuses the same input with the same error.
+  'stack-encrypt/src/dynamic/(context|query|record)\.rs:\d+:\d+: replace <impl (Visitor<\x27de> for ContextVisitor|serde::Deserialize<\x27de> for Confidence>::deserialize::<impl serde::de::Visitor<\x27_> for V|Deserialize<\x27de> for PlanWire>::deserialize::<impl Visitor<\x27de> for V)>::expecting -> fmt::Result with Ok\(Default::default\(\)\)$',
+  # The same for the visitor that reads a refused plan's keys back
+  # (`entry_key`): its error is discarded (`.ok()`), so its message is never
+  # read at all.
+  'stack-encrypt/src/dynamic/record\.rs:\d+:\d+: replace entry_key::<impl Deserialize<\x27de> for Keys>::deserialize::<impl Visitor<\x27de> for V>::expecting -> fmt::Result with Ok\(Default::default\(\)\)$',
 ]
 
 # Headroom over the measured baseline before a slow-but-correct mutant is

Cargo.lock

@@ -120,16 +120,15 @@ web-time = "1.1"
 zeroize = { version = "1.8.1", features = ["derive"] }
 # This is needed because lock_api 0.4.6 was breaking things and the branch forces the use of 0.4.12
 temp-env = { git = "https://github.com/cipherstash/temp-env", branch = "main" }
-vitaminc = { version = "0.6.0", features = ["random", "protected", "encrypt"] }
-vitaminc-aead = "0.6.0"
+vitaminc = { version = "0.6.1", features = ["random", "protected", "encrypt"] }
+vitaminc-aead = "0.6.1"
 # The transport frame and ciphertext codec every language binding carries
 # across its FFI boundary. Optional in stack-encrypt (the `dynamic` feature).
-vitaminc-aead-frame = "0.6.0"
-vitaminc-encrypt = "0.6.0"
-vitaminc-hmac = "0.6.0"
-# Not on crates.io yet: the `[patch.crates-io]` block below supplies it.
+vitaminc-aead-frame = "0.6.1"
+vitaminc-encrypt = "0.6.1"
+vitaminc-hmac = "0.6.1"
 # Normalized equality terms (Unicode 16 NFC text, one integer encoding for
 # every width), which `vitaminc-prf`'s `normalize` feature derives over.
-vitaminc-normalize = "0.6.0"
-vitaminc-prf = { version = "0.6.0", features = ["normalize"] }
-vitaminc-protected = "0.6.0"
+vitaminc-normalize = "0.6.1"
+vitaminc-prf = { version = "0.6.1", features = ["normalize"] }
+vitaminc-protected = "0.6.1"