Merge branch 'main' into konrad/errors

Cargo.toml

@@ -7,7 +7,7 @@
 members = ["backend", "server", "apiclient", "coreclient", "test_harness"]
 
 [workspace.dependencies]
-tls_codec = { version = "0.3.0-pre.4", features = ["derive", "serde", "mls"] }
+tls_codec = { version = "0.3.0", features = ["derive", "serde", "mls"] }
 
 [patch.crates-io]
 tls_codec = { git = 'https://github.com/RustCrypto/formats.git', rev = '3e65c66f4af19f22952200e3c5da3f035efe8e7a' }

coreclient/dart-bridge/makefile

@@ -33,19 +33,19 @@ setup-macos:
 	brew install gawk
 	make setup-flutter
 	flutter config --enable-macos-desktop
-	cargo install flutter_rust_bridge_codegen
+	cargo install flutter_rust_bridge_codegen cargo-expand
 
 setup-linux:
 	sudo snap install flutter --classic
 	sudo apt-get install clang cmake ninja-build pkg-config libgtk-3-dev gawk
 	make setup-flutter
 	flutter config --enable-linux-desktop
-	cargo install flutter_rust_bridge_codegen
+	cargo install flutter_rust_bridge_codegen cargo-expand
 
 setup-ci:
 	flutter pub get
 	flutter doctor
-	cargo install flutter_rust_bridge_codegen --force
+	cargo install flutter_rust_bridge_codegen cargo-expand --force
 
 setup-flutter:
 	flutter upgrade

server/Cargo.toml

@@ -53,6 +53,9 @@ reqwest = { version = "^0.11", features = [
     "rustls-tls-webpki-roots",
     "brotli",
 ] }
+# We're not actually using this. It's just here to fix the dependency of VOPRF
+# to a working version.
+derive-where = { version = "=1.2.1", features = ["zeroize-on-drop"] }
 
 [dependencies.sqlx]
 optional = true