Repository: cloudflare/daphne
Pull request #734 (2024-12-09 18:14:23)

Bump the version of VDAF used to v13


Patch:
diff --git a/Cargo.lock b/Cargo.lock
index 7307923..fdb8725 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,18 +4,18 @@ version = 4
 
 [[package]]
 name = "addr2line"
-version = "0.22.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "aead"
@@ -95,9 +95,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -110,43 +110,43 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.86"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7"
 
 [[package]]
 name = "asn1-rs"
@@ -160,7 +160,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -173,7 +173,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn 1.0.109",
- "synstructure",
+ "synstructure 0.12.6",
 ]
 
 [[package]]
@@ -195,13 +195,13 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
 
 [[package]]
 name = "async-trait"
-version = "0.1.81"
+version = "0.1.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -212,27 +212,26 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "aws-lc-rs"
-version = "1.8.1"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae74d9bd0a7530e8afd1770739ad34b36838829d6ad61818f9230f683f5ad77"
+checksum = "f47bb8cc16b669d267eeccf585aea077d0882f4777b1c1f740217885d6e6e5a3"
 dependencies = [
  "aws-lc-sys",
- "mirai-annotations",
  "paste",
  "zeroize",
 ]
 
 [[package]]
 name = "aws-lc-sys"
-version = "0.20.1"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f0e249228c6ad2d240c2dc94b714d711629d52bad946075d8e9b2f5391f0703"
+checksum = "a2101df3813227bbaaaa0b04cd61c534c7954b22bd68d399b440be937dc63ff7"
 dependencies = [
  "bindgen",
  "cc",
@@ -245,9 +244,9 @@ dependencies = [
 
 [[package]]
 name = "axum"
-version = "0.7.5"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf"
+checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f"
 dependencies = [
  "async-trait",
  "axum-core",
@@ -269,18 +268,19 @@ dependencies = [
  "serde_json",
  "serde_path_to_error",
  "serde_urlencoded",
- "sync_wrapper 1.0.1",
+ "sync_wrapper",
  "tokio",
- "tower",
+ "tower 0.5.2",
  "tower-layer",
  "tower-service",
+ "tracing",
 ]
 
 [[package]]
 name = "axum-core"
-version = "0.4.3"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3"
+checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199"
 dependencies = [
  "async-trait",
  "bytes",
@@ -291,7 +291,7 @@ dependencies = [
  "mime",
  "pin-project-lite",
  "rustversion",
- "sync_wrapper 0.1.2",
+ "sync_wrapper",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -299,25 +299,26 @@ dependencies = [
 
 [[package]]
 name = "axum-extra"
-version = "0.9.3"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0be6ea09c9b96cb5076af0de2e383bd2bc0c18f827cf1967bdd353e0b910d733"
+checksum = "c794b30c904f0a1c2fb7740f7df7f7972dfaa14ef6f57cb6178dc63e5dca2f04"
 dependencies = [
  "axum",
  "axum-core",
  "bytes",
+ "fastrand",
  "futures-util",
  "headers",
  "http",
  "http-body",
  "http-body-util",
  "mime",
+ "multer",
  "pin-project-lite",
  "serde",
- "tower",
+ "tower 0.5.2",
  "tower-layer",
  "tower-service",
- "tracing",
 ]
 
 [[package]]
@@ -328,17 +329,17 @@ checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973"
 
 [[package]]
 name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets",
 ]
 
 [[package]]
@@ -373,9 +374,9 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
 [[package]]
 name = "bindgen"
-version = "0.69.4"
+version = "0.69.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
+checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
 dependencies = [
  "bitflags 2.6.0",
  "cexpr",
@@ -390,7 +391,7 @@ dependencies = [
  "regex",
  "rustc-hash 1.1.0",
  "shlex",
- "syn 2.0.76",
+ "syn 2.0.90",
  "which",
 ]
 
@@ -435,9 +436,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "bytemuck"
-version = "1.17.1"
+version = "1.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2"
+checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a"
 
 [[package]]
 name = "byteorder"
@@ -447,9 +448,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
 
 [[package]]
 name = "cap"
@@ -483,9 +484,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.1.15"
+version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6"
+checksum = "27f657647bcff5394bf56c7317665bbf790a137a50eaaa5c6bfbb9e27a518f2d"
 dependencies = [
  "jobserver",
  "libc",
@@ -507,6 +508,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "chacha20"
 version = "0.9.1"
@@ -533,9 +540,9 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -596,9 +603,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.16"
+version = "4.5.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019"
+checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -606,9 +613,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.15"
+version = "4.5.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
+checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838"
 dependencies = [
  "anstream",
  "anstyle",
@@ -618,36 +625,36 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.13"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
 
 [[package]]
 name = "cmake"
-version = "0.1.51"
+version = "0.1.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a"
+checksum = "c682c223677e0e5b6b7f63a64b9351844c3f1b1678a68b7ee617e30fb082620e"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "config"
@@ -686,9 +693,9 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
 [[package]]
 name = "constcat"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f2e5af989b1955b092db01462980c0a286217f86817e12b2c09aea46bd03651"
+checksum = "4938185353434999ef52c81753c8cca8955ed38042fc29913db3751916f3b7ab"
 
 [[package]]
 name = "core-foundation"
@@ -700,6 +707,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "core-foundation"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.7"
@@ -708,9 +725,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.13"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
+checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
 dependencies = [
  "libc",
 ]
@@ -838,7 +855,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -852,12 +869,12 @@ dependencies = [
  "daphne-service-utils",
  "futures",
  "hex",
- "prio",
+ "prio 0.17.0-alpha.0",
  "prometheus",
  "rand",
  "reqwest",
- "rustls 0.23.12",
- "rustls-native-certs",
+ "rustls 0.23.19",
+ "rustls-native-certs 0.7.3",
  "rustls-pemfile",
  "sentry",
  "serde",
@@ -886,7 +903,8 @@ dependencies = [
  "hpke-rs-rust-crypto",
  "matchit",
  "paste",
- "prio",
+ "prio 0.16.7",
+ "prio 0.17.0-alpha.0",
  "prometheus",
  "rand",
  "rayon",
@@ -896,7 +914,7 @@ dependencies = [
  "serde_json",
  "strum",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tracing",
  "url",
@@ -922,7 +940,7 @@ dependencies = [
  "mappable-rc",
  "p256",
  "paste",
- "prio",
+ "prio 0.17.0-alpha.0",
  "prometheus",
  "rand",
  "rcgen",
@@ -930,9 +948,9 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_yaml",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
- "tower",
+ "tower 0.4.13",
  "tracing",
  "tracing-subscriber",
  "url",
@@ -947,7 +965,8 @@ dependencies = [
  "capnp",
  "capnpc",
  "daphne",
- "prio",
+ "prio 0.16.7",
+ "prio 0.17.0-alpha.0",
  "rand",
  "serde",
  "url",
@@ -970,7 +989,8 @@ dependencies = [
  "hex",
  "http",
  "paste",
- "prio",
+ "prio 0.16.7",
+ "prio 0.17.0-alpha.0",
  "prometheus",
  "rand",
  "reqwest",
@@ -1104,7 +1124,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1166,6 +1186,15 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "658bbadc628dc286b9ae02f0cb0f5411c056eb7487b72f0083203f115de94060"
 
+[[package]]
+name = "encoding_rs"
+version = "0.8.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -1174,14 +1203,20 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.9"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+
 [[package]]
 name = "ff"
 version = "0.13.0"
@@ -1251,9 +1286,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1266,9 +1301,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1276,15 +1311,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1293,38 +1328,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1374,9 +1409,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.29.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "glob"
@@ -1435,9 +1470,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 
 [[package]]
 name = "headers"
@@ -1469,12 +1504,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
-[[package]]
-name = "hermit-abi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
 [[package]]
 name = "hermit-abi"
 version = "0.4.0"
@@ -1570,9 +1599,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
 dependencies = [
  "bytes",
  "fnv",
@@ -1604,9 +1633,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.4"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
 
 [[package]]
 name = "httpdate"
@@ -1616,9 +1645,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "hyper"
-version = "1.4.1"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1637,28 +1666,28 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.2"
+version = "0.27.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
 dependencies = [
  "futures-util",
  "http",
  "hyper",
  "hyper-util",
- "rustls 0.23.12",
- "rustls-native-certs",
+ "rustls 0.23.19",
+ "rustls-native-certs 0.8.1",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls",
  "tower-service",
- "webpki-roots 0.26.3",
+ "webpki-roots 0.26.7",
 ]
 
 [[package]]
 name = "hyper-util"
-version = "0.1.7"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1669,16 +1698,15 @@ dependencies = [
  "pin-project-lite",
  "socket2",
  "tokio",
- "tower",
  "tower-service",
  "tracing",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -1697,24 +1725,153 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
 name = "indexmap"
-version = "2.4.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.2",
 ]
 
 [[package]]
@@ -1728,9 +1885,9 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.9.0"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
 
 [[package]]
 name = "is-terminal"
@@ -1738,7 +1895,7 @@ version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
 dependencies = [
- "hermit-abi 0.4.0",
+ "hermit-abi",
  "libc",
  "windows-sys 0.52.0",
 ]
@@ -1769,9 +1926,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "jobserver"
@@ -1784,10 +1941,11 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -1825,15 +1983,15 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.168"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d"
 
 [[package]]
 name = "libloading"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
+checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
 dependencies = [
  "cfg-if",
  "windows-targets",
@@ -1851,6 +2009,12 @@ version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
+[[package]]
+name = "litemap"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -1908,11 +2072,11 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.4"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
 dependencies = [
- "adler",
+ "adler2",
 ]
 
 [[package]]
@@ -1923,21 +2087,31 @@ checksum = "9bec4598fddb13cc7b528819e697852653252b760f1228b7642679bf2ff2cd07"
 
 [[package]]
 name = "mio"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
- "hermit-abi 0.3.9",
  "libc",
  "wasi",
  "windows-sys 0.52.0",
 ]
 
 [[package]]
-name = "mirai-annotations"
-version = "1.12.0"
+name = "multer"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1"
+checksum = "83e87776546dc87511aa5ee218730c92b666d7264ab6ed41f9d215af9cd5224b"
+dependencies = [
+ "bytes",
+ "encoding_rs",
+ "futures-util",
+ "http",
+ "httparse",
+ "memchr",
+ "mime",
+ "spin",
+ "version_check",
+]
 
 [[package]]
 name = "nom"
@@ -2020,9 +2194,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.3"
+version = "0.36.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
 dependencies = [
  "memchr",
 ]
@@ -2038,9 +2212,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "oorandom"
@@ -2072,9 +2246,9 @@ dependencies = [
 
 [[package]]
 name = "os_info"
-version = "3.8.2"
+version = "3.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092"
+checksum = "e5ca711d8b83edbb00b44d504503cd247c9c0bd8b0fa2694f2a1a3d8165379ce"
 dependencies = [
  "log",
  "serde",
@@ -2140,9 +2314,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "pathdiff"
-version = "0.2.1"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
+checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
 
 [[package]]
 name = "pem"
@@ -2171,20 +2345,20 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.7.11"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95"
+checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc"
 dependencies = [
  "memchr",
- "thiserror",
+ "thiserror 2.0.6",
  "ucd-trie",
 ]
 
 [[package]]
 name = "pest_derive"
-version = "2.7.11"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a"
+checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e"
 dependencies = [
  "pest",
  "pest_generator",
@@ -2192,22 +2366,22 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.11"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183"
+checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.7.11"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f"
+checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea"
 dependencies = [
  "once_cell",
  "pest",
@@ -2216,29 +2390,29 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.1.5"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.5"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "pin-utils"
@@ -2258,9 +2432,9 @@ dependencies = [
 
 [[package]]
 name = "plotters"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3"
+checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
 dependencies = [
  "num-traits",
  "plotters-backend",
@@ -2271,15 +2445,15 @@ dependencies = [
 
 [[package]]
 name = "plotters-backend"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7"
+checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
 
 [[package]]
 name = "plotters-svg"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705"
+checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
 dependencies = [
  "plotters-backend",
 ]
@@ -2324,12 +2498,12 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.2.22"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba"
+checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"
 dependencies = [
  "proc-macro2",
- "syn 2.0.76",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -2368,15 +2542,45 @@ dependencies = [
  "sha2",
  "sha3",
  "subtle",
- "thiserror",
+ "thiserror 1.0.69",
+ "zipf",
+]
+
+[[package]]
+name = "prio"
+version = "0.17.0-alpha.0"
+source = "git+https://github.com/divviup/libprio-rs.git?rev=937e8a61c51019671232dee2d28dbe72413cdadc#937e8a61c51019671232dee2d28dbe72413cdadc"
+dependencies = [
+ "aes",
+ "bitvec",
+ "byteorder",
+ "ctr",
+ "fiat-crypto",
+ "fixed",
+ "getrandom",
+ "hex",
+ "hmac",
+ "num-bigint",
+ "num-integer",
+ "num-iter",
+ "num-rational",
+ "num-traits",
+ "rand",
+ "rand_core",
+ "serde",
+ "serde_json",
+ "sha2",
+ "sha3",
+ "subtle",
+ "thiserror 2.0.6",
  "zipf",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
  "unicode-ident",
 ]
@@ -2393,7 +2597,7 @@ dependencies = [
  "memchr",
  "parking_lot",
  "protobuf",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -2404,50 +2608,54 @@ checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"
 
 [[package]]
 name = "quinn"
-version = "0.11.3"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156"
+checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef"
 dependencies = [
  "bytes",
  "pin-project-lite",
  "quinn-proto",
  "quinn-udp",
- "rustc-hash 2.0.0",
- "rustls 0.23.12",
+ "rustc-hash 2.1.0",
+ "rustls 0.23.19",
  "socket2",
- "thiserror",
+ "thiserror 2.0.6",
  "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.8"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6"
+checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
 dependencies = [
  "bytes",
+ "getrandom",
  "rand",
  "ring",
- "rustc-hash 2.0.0",
- "rustls 0.23.12",
+ "rustc-hash 2.1.0",
+ "rustls 0.23.19",
+ "rustls-pki-types",
  "slab",
- "thiserror",
+ "thiserror 2.0.6",
  "tinyvec",
  "tracing",
+ "web-time",
 ]
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.4"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
+checksum = "52cd4b1eff68bf27940dd39811292c49e007f4d0b4c357358dc9b0197be6b527"
 dependencies = [
+ "cfg_aliases",
  "libc",
  "once_cell",
  "socket2",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2529,23 +2737,23 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
  "bitflags 2.6.0",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
+ "regex-automata 0.4.9",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -2559,13 +2767,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -2576,15 +2784,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
-version = "0.12.7"
+version = "0.12.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
+checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -2605,14 +2813,14 @@ dependencies = [
  "percent-encoding",
  "pin-project-lite",
  "quinn",
- "rustls 0.23.12",
- "rustls-native-certs",
+ "rustls 0.23.19",
+ "rustls-native-certs 0.8.1",
  "rustls-pemfile",
  "rustls-pki-types",
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper 1.0.1",
+ "sync_wrapper",
  "tokio",
  "tokio-rustls",
  "tower-service",
@@ -2620,7 +2828,7 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "webpki-roots 0.26.3",
+ "webpki-roots 0.26.7",
  "windows-registry",
 ]
 
@@ -2684,15 +2892,15 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustc-hash"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
 
 [[package]]
 name = "rustc_version"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
  "semver",
 ]
@@ -2708,15 +2916,15 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.34"
+version = "0.38.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
 dependencies = [
  "bitflags 2.6.0",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2733,48 +2941,62 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.12"
+version = "0.23.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
+checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1"
 dependencies = [
  "aws-lc-rs",
  "log",
  "once_cell",
  "ring",
  "rustls-pki-types",
- "rustls-webpki 0.102.7",
+ "rustls-webpki 0.102.8",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
 name = "rustls-native-certs"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04182dffc9091a404e0fc069ea5cd60e5b866c3adf881eff99a32d048242dffa"
+checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5"
 dependencies = [
  "openssl-probe",
  "rustls-pemfile",
  "rustls-pki-types",
  "schannel",
- "security-framework",
+ "security-framework 2.11.1",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3"
+dependencies = [
+ "openssl-probe",
+ "rustls-pki-types",
+ "schannel",
+ "security-framework 3.0.1",
 ]
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
- "base64 0.22.1",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
+dependencies = [
+ "web-time",
+]
 
 [[package]]
 name = "rustls-webpki"
@@ -2788,9 +3010,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.7"
+version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
  "aws-lc-rs",
  "ring",
@@ -2800,9 +3022,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
 
 [[package]]
 name = "ryu"
@@ -2821,11 +3043,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.23"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2865,7 +3087,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
  "bitflags 2.6.0",
- "core-foundation",
+ "core-foundation 0.9.4",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1415a607e92bec364ea2cf9264646dcce0f91e6d65281bd6f2819cca3bf39c8"
+dependencies = [
+ "bitflags 2.6.0",
+ "core-foundation 0.10.0",
  "core-foundation-sys",
  "libc",
  "security-framework-sys",
@@ -2873,9 +3108,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.1"
+version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -2990,7 +3225,7 @@ dependencies = [
  "rand",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
  "url",
  "uuid",
@@ -2998,9 +3233,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.209"
+version = "1.0.216"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
 dependencies = [
  "serde_derive",
 ]
@@ -3029,20 +3264,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.209"
+version = "1.0.216"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.127"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
 dependencies = [
  "itoa",
  "memchr",
@@ -3168,9 +3403,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "socket2"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -3192,6 +3427,12 @@ dependencies = [
  "der",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -3217,7 +3458,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.76",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -3239,9 +3480,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.76"
+version = "2.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525"
+checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3250,15 +3491,9 @@ dependencies = [
 
 [[package]]
 name = "sync_wrapper"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-
-[[package]]
-name = "sync_wrapper"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
 dependencies = [
  "futures-core",
 ]
@@ -3275,6 +3510,17 @@ dependencies = [
  "unicode-xid",
 ]
 
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
 [[package]]
 name = "tap"
 version = "1.0.1"
@@ -3283,22 +3529,42 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47"
+dependencies = [
+ "thiserror-impl 2.0.6",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
- "thiserror-impl",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -3319,9 +3585,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.36"
+version = "0.3.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
 dependencies = [
  "deranged",
  "itoa",
@@ -3340,14 +3606,24 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
 dependencies = [
  "num-conv",
  "time-core",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tinytemplate"
 version = "1.2.1"
@@ -3392,14 +3668,14 @@ checksum = "8d9ef545650e79f30233c0003bcc2504d7efac6dad25fca40744de773fe2049c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "tokio"
-version = "1.39.3"
+version = "1.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5"
+checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
 dependencies = [
  "backtrace",
  "bytes",
@@ -3420,25 +3696,24 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
 dependencies = [
- "rustls 0.23.12",
- "rustls-pki-types",
+ "rustls 0.23.19",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-util"
-version = "0.7.11"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
 dependencies = [
  "bytes",
  "futures-core",
@@ -3466,12 +3741,26 @@ dependencies = [
  "futures-util",
  "pin-project",
  "pin-project-lite",
- "tokio",
  "tower-layer",
  "tower-service",
  "tracing",
 ]
 
+[[package]]
+name = "tower"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+]
+
 [[package]]
 name = "tower-layer"
 version = "0.3.3"
@@ -3486,9 +3775,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "log",
  "pin-project-lite",
@@ -3498,20 +3787,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
  "valuable",
@@ -3530,9 +3819,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-serde"
-version = "0.1.3"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1"
+checksum = "704b1aeb7be0d0a84fc9828cae51dab5970fee5088f83d1dd7ee6f6246fc6ff1"
 dependencies = [
  "serde",
  "tracing-core",
@@ -3540,9 +3829,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
 dependencies = [
  "matchers",
  "nu-ansi-term",
@@ -3573,9 +3862,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "ucd-trie"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
+checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
 
 [[package]]
 name = "uname"
@@ -3586,32 +3875,17 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "unicode-bidi"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
-
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "universal-hash"
@@ -3637,24 +3911,24 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "ureq"
-version = "2.10.1"
+version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a"
+checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d"
 dependencies = [
  "base64 0.22.1",
  "log",
  "once_cell",
- "rustls 0.23.12",
+ "rustls 0.23.19",
  "rustls-pki-types",
  "url",
- "webpki-roots 0.26.3",
+ "webpki-roots 0.26.7",
 ]
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -3662,6 +3936,18 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -3670,9 +3956,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
 dependencies = [
  "serde",
 ]
@@ -3716,9 +4002,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -3727,24 +4013,23 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.90",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -3754,9 +4039,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3764,28 +4049,28 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.90",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
 
 [[package]]
 name = "wasm-streams"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
+checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd"
 dependencies = [
  "futures-util",
  "js-sys",
@@ -3796,9 +4081,19 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3822,9 +4117,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.3"
+version = "0.26.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd"
+checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -4044,7 +4339,7 @@ dependencies = [
  "serde",
  "serde-wasm-bindgen 0.5.0",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
  "wasm-bindgen",
  "wasm-bindgen-futures",
 ]
@@ -4058,7 +4353,7 @@ dependencies = [
  "async-trait",
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.90",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-bindgen-macro-support",
@@ -4077,6 +4372,18 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "wyz"
 version = "0.5.1"
@@ -4111,7 +4418,7 @@ dependencies = [
  "nom",
  "oid-registry",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -4133,6 +4440,30 @@ dependencies = [
  "time",
 ]
 
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+ "synstructure 0.13.1",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -4151,7 +4482,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+ "synstructure 0.13.1",
 ]
 
 [[package]]
@@ -4171,7 +4523,29 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.76",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 60941ce..2d14832 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -60,7 +60,8 @@ mappable-rc = "0.1.1"
 matchit = "0.7.3"
 p256 = { version = "0.13.2", features = ["ecdsa-core", "ecdsa", "pem"] }
 paste = "1.0.15"
-prio = "0.16.7"
+prio_draft09 = { package = "prio", version = "0.16.7" }
+prio = { git = "https://github.com/divviup/libprio-rs.git", rev = "937e8a61c51019671232dee2d28dbe72413cdadc" }
 prometheus = "0.13.4"
 rand = "0.8.5"
 rayon = "1.10.0"
@@ -84,7 +85,7 @@ tower-service = "0.3"
 tracing = "0.1.40"
 tracing-core = "0.1.32"
 tracing-subscriber = "0.3.18"
-url = { version = "2.5.2", features = ["serde"] }
+url = { version = "2.5.4", features = ["serde"] }
 webpki = "0.22.4"
 worker = { version = "0.4", features = ["http"] }
 x509-parser = "0.15.1"
diff --git a/crates/dapf/src/cli_parsers.rs b/crates/dapf/src/cli_parsers.rs
index bd2156b..f0978cd 100644
--- a/crates/dapf/src/cli_parsers.rs
+++ b/crates/dapf/src/cli_parsers.rs
@@ -59,7 +59,7 @@ impl DefaultVdafConfigs {
         match self {
             Self::Prio2Dimension99k => VdafConfig::Prio2 { dimension: 99_992 },
             Self::Prio3NumProofs2 => {
-                VdafConfig::Prio3(Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
+                VdafConfig::Prio3Draft09(Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
                     bits: 1,
                     length: 100_000,
                     chunk_length: 320,
@@ -67,7 +67,7 @@ impl DefaultVdafConfigs {
                 })
             }
             Self::Prio3NumProofs3 => {
-                VdafConfig::Prio3(Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
+                VdafConfig::Prio3Draft09(Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
                     bits: 1,
                     length: 100_000,
                     chunk_length: 320,
diff --git a/crates/daphne-server/src/roles/mod.rs b/crates/daphne-server/src/roles/mod.rs
index 5624de0..62a5de9 100644
--- a/crates/daphne-server/src/roles/mod.rs
+++ b/crates/daphne-server/src/roles/mod.rs
@@ -187,25 +187,25 @@ mod test_utils {
                 cmd.vdaf.length,
                 cmd.vdaf.chunk_length,
             ) {
-                ("Prio3Count", None, None, None) => VdafConfig::Prio3(Prio3Config::Count),
-                ("Prio3Sum", Some(bits), None, None) => VdafConfig::Prio3(Prio3Config::Sum {
+                ("Prio3Count", None, None, None) => VdafConfig::Prio3Draft09(Prio3Config::Count),
+                ("Prio3Sum", Some(bits), None, None) => VdafConfig::Prio3Draft09(Prio3Config::Sum {
                     bits: bits.parse().map_err(|e| fatal_error!(err = ?e, "failed to parse bits for Prio3Config::Sum"))?,
                 }),
                 ("Prio3SumVec", Some(bits), Some(length), Some(chunk_length)) => {
-                    VdafConfig::Prio3(Prio3Config::SumVec {
+                    VdafConfig::Prio3Draft09(Prio3Config::SumVec {
                         bits: bits.parse().map_err(|e| fatal_error!(err = ?e, "failed to parse bits for Prio3Config::SumVec"))?,
                         length: length.parse().map_err(|e| fatal_error!(err = ?e, "failed to parse length for Prio3Config::SumVec"))?,
                         chunk_length: chunk_length.parse().map_err(|e| fatal_error!(err = ?e, "failed to parse chunk_length for Prio3Config::SumVec"))?,
                     })
                 }
                 ("Prio3Histogram", None, Some(length), Some(chunk_length)) => {
-                    VdafConfig::Prio3(Prio3Config::Histogram {
+                    VdafConfig::Prio3Draft09(Prio3Config::Histogram {
                         length: length.parse().map_err(|e| fatal_error!(err = ?e, "failed to parse length for Prio3Config::Histogram"))?,
                         chunk_length: chunk_length.parse().map_err(|e| fatal_error!(err = ?e, "failed to parse chunk_length for Prio3Config::Histogram"))?,
                     })
                 }
                 ("Prio3SumVecField64MultiproofHmacSha256Aes128", Some(bits), Some(length), Some(chunk_length)) => {
-                    VdafConfig::Prio3(Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
+                    VdafConfig::Prio3Draft09(Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
                         bits: bits.parse().map_err(|e| fatal_error!(err = ?e, "failed to parse bits for Prio3Config::SumVecField64MultiproofHmacSha256Aes128"))?,
                         length: length.parse().map_err(|e| fatal_error!(err = ?e, "failed to parse length for Prio3Config::SumVecField64MultiproofHmacSha256Aes128"))?,
                         chunk_length: chunk_length.parse().map_err(|e| fatal_error!(err = ?e, "failed to parse chunk_length for Prio3Config::SumVecField64MultiproofHmacSha256Aes128"))?,
diff --git a/crates/daphne-service-utils/Cargo.toml b/crates/daphne-service-utils/Cargo.toml
index ef95cd6..2c9d50b 100644
--- a/crates/daphne-service-utils/Cargo.toml
+++ b/crates/daphne-service-utils/Cargo.toml
@@ -14,6 +14,7 @@ repository.workspace = true
 [dependencies]
 capnp = { workspace = true, optional = true }
 daphne = { path = "../daphne", default-features = false }
+prio_draft09 = { workspace = true, optional = true }
 prio = { workspace = true, optional = true }
 serde.workspace = true
 url = { workspace = true, optional = true }
@@ -27,7 +28,7 @@ capnpc = { workspace = true, optional = true }
 
 [features]
 test-utils = ["dep:url", "daphne/prometheus", "daphne/test-utils"]
-durable_requests = ["dep:capnp", "dep:capnpc", "dep:prio"]
+durable_requests = ["dep:capnp", "dep:capnpc", "dep:prio_draft09", "dep:prio"]
 experimental = ["daphne/experimental"]
 
 [lints]
diff --git a/crates/daphne-service-utils/src/durable_requests/bindings/aggregate_store.rs b/crates/daphne-service-utils/src/durable_requests/bindings/aggregate_store.rs
index 4cfbdb0..4cac9c9 100644
--- a/crates/daphne-service-utils/src/durable_requests/bindings/aggregate_store.rs
+++ b/crates/daphne-service-utils/src/durable_requests/bindings/aggregate_store.rs
@@ -16,6 +16,14 @@ use crate::{
 };
 
 use super::DurableRequestPayload;
+use prio::{
+    field::{FieldElement, FieldError},
+    vdaf::AggregateShare,
+};
+use prio_draft09::{
+    field::{FieldElement as FieldElementDraft09, FieldError as FieldErrorDraft09},
+    vdaf::AggregateShare as AggregateShareDraft09,
+};
 
 super::define_do_binding! {
     const BINDING = "DAP_AGGREGATE_STORE";
@@ -97,26 +105,41 @@ impl DurableRequestPayload for AggregateStoreMergeReq {
                 checksum.copy_from_slice(&agg_share_delta.checksum);
             }
             {
-                fn encode<'b, F, B, const ENCODED_SIZE: usize>(
-                    field: &prio::vdaf::AggregateShare<F>,
-                    get_bytes: B,
-                ) where
-                    F: prio::field::FieldElement + Into<[u8; ENCODED_SIZE]>,
-                    B: FnOnce(u32) -> &'b mut [u8],
-                {
-                    let mut bytes = get_bytes(
-                        (F::ENCODED_SIZE * field.as_ref().len())
-                            .try_into()
-                            .expect("trying to encode a buffer longer than u32::MAX"),
-                    );
-                    for f in field.as_ref() {
-                        let f: [u8; ENCODED_SIZE] = (*f).into();
-                        bytes[..ENCODED_SIZE].copy_from_slice(&f);
-                        bytes = &mut bytes[ENCODED_SIZE..];
-                    }
+                macro_rules! make_encode {
+                    ($func_name:ident, $agg_share_type:ident, $field_trait:ident) => {
+                        fn $func_name<'b, F, B, const ENCODED_SIZE: usize>(
+                            field: &$agg_share_type<F>,
+                            get_bytes: B,
+                        ) where
+                            F: $field_trait + Into<[u8; ENCODED_SIZE]>,
+                            B: FnOnce(u32) -> &'b mut [u8],
+                        {
+                            let mut bytes = get_bytes(
+                                (F::ENCODED_SIZE * field.as_ref().len())
+                                    .try_into()
+                                    .expect("trying to encode a buffer longer than u32::MAX"),
+                            );
+                            for f in field.as_ref() {
+                                let f: [u8; ENCODED_SIZE] = (*f).into();
+                                bytes[..ENCODED_SIZE].copy_from_slice(&f);
+                                bytes = &mut bytes[ENCODED_SIZE..];
+                            }
+                        }
+                    };
                 }
+                make_encode!(encode_draft09, AggregateShareDraft09, FieldElementDraft09);
+                make_encode!(encode, AggregateShare, FieldElement);
                 let mut data = agg_share_delta_packet.init_data();
                 match &self.agg_share_delta.data {
+                    Some(VdafAggregateShare::Field64Draft09(field)) => {
+                        encode_draft09(field, |len| data.init_field64_draft09(len));
+                    }
+                    Some(VdafAggregateShare::Field128Draft09(field)) => {
+                        encode_draft09(field, |len| data.init_field128_draft09(len));
+                    }
+                    Some(VdafAggregateShare::Field32Draft09(field)) => {
+                        encode_draft09(field, |len| data.init_field_prio2_draft09(len));
+                    }
                     Some(VdafAggregateShare::Field64(field)) => {
                         encode(field, |len| data.init_field64(len));
                     }
@@ -147,23 +170,45 @@ impl DurableRequestPayload for AggregateStoreMergeReq {
         let agg_share_delta = {
             let agg_share_delta = request.get_agg_share_delta()?;
             let data = {
-                fn decode<F>(fields: &[u8]) -> capnp::Result<prio::vdaf::AggregateShare<F>>
-                where
-                    F: prio::field::FieldElement
-                        + for<'s> TryFrom<&'s [u8], Error = prio::field::FieldError>,
-                {
-                    let iter = fields.chunks_exact(F::ENCODED_SIZE);
-                    if let length @ 1.. = iter.remainder().len() {
-                        return Err(capnp::Error {
-                            kind: capnp::ErrorKind::Failed,
-                            extra: format!("leftover bytes still present in buffer: {length}"),
-                        });
-                    }
-                    Ok(prio::vdaf::AggregateShare::from(
-                        iter.map(|f| f.try_into().unwrap()).collect::<Vec<_>>(),
-                    ))
+                macro_rules! make_decode {
+                    ($func_name:ident, $agg_share_type:ident, $field_trait:ident, $field_error:ident) => {
+                        fn $func_name<F>(fields: &[u8]) -> capnp::Result<$agg_share_type<F>>
+                        where
+                            F: $field_trait + for<'s> TryFrom<&'s [u8], Error = $field_error>,
+                        {
+                            let iter = fields.chunks_exact(F::ENCODED_SIZE);
+                            if let length @ 1.. = iter.remainder().len() {
+                                return Err(capnp::Error {
+                                    kind: capnp::ErrorKind::Failed,
+                                    extra: format!(
+                                        "leftover bytes still present in buffer: {length}"
+                                    ),
+                                });
+                            }
+                            Ok($agg_share_type::from(
+                                iter.map(|f| f.try_into().unwrap()).collect::<Vec<_>>(),
+                            ))
+                        }
+                    };
                 }
+                make_decode!(
+                    decode_draft09,
+                    AggregateShareDraft09,
+                    FieldElementDraft09,
+                    FieldErrorDraft09
+                );
+                make_decode!(decode, AggregateShare, FieldElement, FieldError);
                 match agg_share_delta.get_data().which()? {
+                    dap_aggregate_share::data::Which::Field64Draft09(field) => {
+                        Some(VdafAggregateShare::Field64Draft09(decode_draft09(field?)?))
+                    }
+                    dap_aggregate_share::data::Which::Field128Draft09(field) => {
+                        Some(VdafAggregateShare::Field128Draft09(decode_draft09(field?)?))
+                    }
+                    dap_aggregate_share::data::Which::FieldPrio2Draft09(field) => {
+                        Some(VdafAggregateShare::Field32Draft09(decode_draft09(field?)?))
+                    }
+
                     dap_aggregate_share::data::Which::Field64(field) => {
                         Some(VdafAggregateShare::Field64(decode(field?)?))
                     }
@@ -230,12 +275,86 @@ mod test {
         field::{Field128, Field64, FieldElement, FieldPrio2},
         vdaf::AggregateShare,
     };
+    use prio_draft09::{
+        codec::Decode as DecodeDraft09,
+        field::{
+            Field128 as Field128Draft09, Field64 as Field64Draft09,
+            FieldElement as FieldElementDraft09, FieldPrio2 as FieldPrio2Draft09,
+        },
+        vdaf::AggregateShare as AggregateShareDraft09,
+    };
     use rand::{thread_rng, Rng};
 
     use crate::durable_requests::bindings::DurableRequestPayloadExt;
 
     use super::*;
 
+    #[test]
+    fn serialization_deserialization_round_trip_draft09() {
+        let mut rng = thread_rng();
+        for len in 0..20 {
+            let test_data = [
+                VdafAggregateShare::Field64Draft09(AggregateShareDraft09::from(
+                    (0..len)
+                        .map(|_| {
+                            Field64Draft09::get_decoded(
+                                &rng.gen::<[_; Field64Draft09::ENCODED_SIZE]>(),
+                            )
+                            .unwrap()
+                        })
+                        .collect::<Vec<_>>(),
+                )),
+                VdafAggregateShare::Field128Draft09(AggregateShareDraft09::from(
+                    (0..len)
+                        .map(|_| {
+                            Field128Draft09::get_decoded(
+                                &rng.gen::<[_; Field128Draft09::ENCODED_SIZE]>(),
+                            )
+                            .unwrap()
+                        })
+                        .collect::<Vec<_>>(),
+                )),
+                VdafAggregateShare::Field32Draft09(AggregateShareDraft09::from(
+                    (0..len)
+                        .map(|_| {
+                            // idk how to consistently generate a valid FieldPrio2 value, so I just
+                            // retry until I hit a valid one. Doesn't usualy take too long.
+                            (0..)
+                                .find_map(|_| {
+                                    FieldPrio2Draft09::get_decoded(&rng.gen::<[_; 4]>()).ok()
+                                })
+                                .unwrap()
+                        })
+                        .collect::<Vec<_>>(),
+                )),
+            ]
+            .map(Some)
+            .into_iter()
+            .chain([None]);
+            for (i, data) in test_data.enumerate() {
+                let this = AggregateStoreMergeReq {
+                    contained_reports: (0..len)
+                        .map(|_| ReportId::get_decoded(&rng.gen::<[_; 16]>()).unwrap())
+                        .collect(),
+                    agg_share_delta: DapAggregateShare {
+                        report_count: rng.gen(),
+                        min_time: rng.gen(),
+                        max_time: rng.gen(),
+                        checksum: rng.gen(),
+                        data,
+                    },
+                    options: AggregateStoreMergeOptions {
+                        skip_replay_protection: i % 2 == 0,
+                    },
+                };
+                let other =
+                    AggregateStoreMergeReq::decode_from_bytes(&this.encode_to_bytes().unwrap())
+                        .unwrap();
+                assert_eq!(this, other);
+            }
+        }
+    }
+
     #[test]
     fn serialization_deserialization_round_trip() {
         let mut rng = thread_rng();
diff --git a/crates/daphne-service-utils/src/durable_requests/durable_request.capnp b/crates/daphne-service-utils/src/durable_requests/durable_request.capnp
index 979771d..a88a2a1 100644
--- a/crates/daphne-service-utils/src/durable_requests/durable_request.capnp
+++ b/crates/daphne-service-utils/src/durable_requests/durable_request.capnp
@@ -35,10 +35,13 @@ struct DapAggregateShare @0xb34ce529a4a66aed {
     maxTime @2 :UInt64;
     checksum @3 :Data;
     data :union {
-        field64 @4 :Data;
-        field128 @5 :Data;
-        fieldPrio2 @6 :Data;
+        field64Draft09@4 :Data;
+        field128Draft09@5 :Data;
+        fieldPrio2Draft09@6 :Data;
         none @7 :Void;
+        field64 @8 :Data;
+        field128 @9 :Data;
+        fieldPrio2 @10 :Data;
     }
 }
 
diff --git a/crates/daphne-worker/Cargo.toml b/crates/daphne-worker/Cargo.toml
index 3183f4c..d1b1973 100644
--- a/crates/daphne-worker/Cargo.toml
+++ b/crates/daphne-worker/Cargo.toml
@@ -29,6 +29,7 @@ getrandom = { workspace = true, features = ["js"] }
 headers.workspace = true
 hex.workspace = true
 http.workspace = true
+prio_draft09.workspace = true
 prio.workspace = true
 prometheus.workspace = true
 rand.workspace = true
diff --git a/crates/daphne-worker/src/durable/aggregate_store.rs b/crates/daphne-worker/src/durable/aggregate_store.rs
index b6f3fbf..e3a8af4 100644
--- a/crates/daphne-worker/src/durable/aggregate_store.rs
+++ b/crates/daphne-worker/src/durable/aggregate_store.rs
@@ -35,11 +35,15 @@ use daphne_service_utils::durable_requests::bindings::{
     self, AggregateStoreMergeOptions, AggregateStoreMergeReq, AggregateStoreMergeResp,
     DurableMethod,
 };
+
 use prio::{
     codec::{Decode, Encode},
     field::FieldElement,
     vdaf::AggregateShare,
 };
+use prio_draft09::{
+    field::FieldElement as FieldElementDraft09, vdaf::AggregateShare as AggregateShareDraft09,
+};
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use worker::{
     js_sys, wasm_bindgen::JsValue, Env, Error, Request, Response, Result, ScheduledTime, State,
@@ -66,6 +70,9 @@ const COLLECTED_KEY: &str = "collected";
 #[derive(Debug, Serialize, Deserialize, Clone, Copy)]
 #[serde(rename_all = "snake_case")]
 enum VdafKind {
+    Field32Draft09,
+    Field64Draft09,
+    Field128Draft09,
     Field32,
     Field64,
     Field128,
@@ -88,6 +95,9 @@ impl DapAggregateShareMetadata {
             max_time: share.max_time,
             checksum: share.checksum,
             kind: share.data.as_ref().map(|data| match data {
+                daphne::vdaf::VdafAggregateShare::Field32Draft09(_) => VdafKind::Field32Draft09,
+                daphne::vdaf::VdafAggregateShare::Field64Draft09(_) => VdafKind::Field64Draft09,
+                daphne::vdaf::VdafAggregateShare::Field128Draft09(_) => VdafKind::Field128Draft09,
                 daphne::vdaf::VdafAggregateShare::Field32(_) => VdafKind::Field32,
                 daphne::vdaf::VdafAggregateShare::Field64(_) => VdafKind::Field64,
                 daphne::vdaf::VdafAggregateShare::Field128(_) => VdafKind::Field128,
@@ -275,40 +285,58 @@ impl AggregateStore {
                 } else {
                     let kind = meta.kind.expect("if there is data there should be a type");
 
-                    fn from_slices<F, I>(chunks: I) -> Result<AggregateShare<F>>
-                    where
-                        F: FieldElement,
-                        I: Iterator<Item = Vec<u8>>,
-                    {
-                        let mut share = Vec::new();
-                        for chunk in chunks {
-                            let len = u64::try_from(chunk.len()).unwrap();
-                            let mut bytes = Cursor::new(chunk.as_slice());
-                            while bytes.position() < len {
-                                let x = F::decode(&mut bytes).map_err(|e| {
-                                    worker::Error::Internal(
-                                        serde_wasm_bindgen::to_value(&format!(
-                                            "failed to decode aggregate share: {e}"
-                                        ))
+                    macro_rules! make_from_slices {
+                        ($func_name:ident, $agg_share_type:ident, $field_trait:ident) => {
+                            fn $func_name<F, I>(chunks: I) -> Result<$agg_share_type<F>>
+                            where
+                                F: $field_trait,
+                                I: Iterator<Item = Vec<u8>>,
+                            {
+                                let mut share = Vec::new();
+                                for chunk in chunks {
+                                    let len = u64::try_from(chunk.len()).unwrap();
+                                    let mut bytes = Cursor::new(chunk.as_slice());
+                                    while bytes.position() < len {
+                                        let x = F::decode(&mut bytes).map_err(|e| {
+                                            worker::Error::Internal(
+                                                serde_wasm_bindgen::to_value(&format!(
+                                                    "failed to decode aggregate share: {e}"
+                                                ))
+                                                .expect("string never fails to convert to JsValue"),
+                                            )
+                                        })?;
+                                        share.push(x);
+                                    }
+                                    if bytes.position() < len {
+                                        return Err(worker::Error::Internal(
+                                        serde_wasm_bindgen::to_value(
+                                            "failed to decode aggregate share: bytes remaining in buffer",
+                                        )
                                         .expect("string never fails to convert to JsValue"),
-                                    )
-                                })?;
-                                share.push(x);
-                            }
-                            if bytes.position() < len {
-                                return Err(worker::Error::Internal(
-                                serde_wasm_bindgen::to_value(
-                                    "failed to decode aggregate share: bytes remaining in buffer",
-                                )
-                                .expect("string never fails to convert to JsValue"),
-                            ));
-                            }
-                        }
+                                    ));
+                                    }
+                                }
 
-                        Ok(AggregateShare::from(share))
+                                Ok($agg_share_type::from(share))
+                            }
+                        };
                     }
-
+                    make_from_slices!(
+                        from_slices_draft09,
+                        AggregateShareDraft09,
+                        FieldElementDraft09
+                    );
+                    make_from_slices!(from_slices, AggregateShare, FieldElement);
                     let data = match kind {
+                        VdafKind::Field32Draft09 => {
+                            VdafAggregateShare::Field32Draft09(from_slices_draft09(chunks)?)
+                        }
+                        VdafKind::Field64Draft09 => {
+                            VdafAggregateShare::Field64Draft09(from_slices_draft09(chunks)?)
+                        }
+                        VdafKind::Field128Draft09 => {
+                            VdafAggregateShare::Field128Draft09(from_slices_draft09(chunks)?)
+                        }
                         VdafKind::Field32 => VdafAggregateShare::Field32(from_slices(chunks)?),
                         VdafKind::Field64 => VdafAggregateShare::Field64(from_slices(chunks)?),
                         VdafKind::Field128 => VdafAggregateShare::Field128(from_slices(chunks)?),
diff --git a/crates/daphne/Cargo.toml b/crates/daphne/Cargo.toml
index 281d7cc..57caac7 100644
--- a/crates/daphne/Cargo.toml
+++ b/crates/daphne/Cargo.toml
@@ -24,6 +24,7 @@ hex.workspace = true
 hpke-rs = { workspace = true, features = ["hazmat", "serialization"] }
 hpke-rs-crypto.workspace = true
 hpke-rs-rust-crypto.workspace = true
+prio_draft09 = { workspace = true, features = ["experimental"] }
 prio = { workspace = true, features = ["experimental"] }
 prometheus = { workspace = true, optional = true }
 rand.workspace = true
@@ -43,6 +44,7 @@ criterion.workspace = true
 deepsize.workspace = true
 matchit.workspace = true
 paste.workspace = true
+prio_draft09 = { workspace = true, features = ["test-util"] }
 prio = { workspace = true, features = ["test-util"] }
 prometheus.workspace = true
 rayon.workspace = true
diff --git a/crates/daphne/benches/aggregation.rs b/crates/daphne/benches/aggregation.rs
index f1ea974..2ae7055 100644
--- a/crates/daphne/benches/aggregation.rs
+++ b/crates/daphne/benches/aggregation.rs
@@ -43,7 +43,7 @@ fn consume_reports_vary_vdaf_dimension(c: &mut Criterion) {
 
     let mut g = c.benchmark_group(function!());
     for vdaf_length in vdaf_lengths {
-        let vdaf = VdafConfig::Prio3(Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
+        let vdaf = VdafConfig::Prio3Draft09(Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
             bits: 1,
             length: vdaf_length,
             chunk_length: 320,
@@ -67,7 +67,7 @@ fn consume_reports_vary_vdaf_dimension(c: &mut Criterion) {
 
 fn consume_reports_vary_num_reports(c: &mut Criterion) {
     const VDAF: VdafConfig =
-        VdafConfig::Prio3(Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
+        VdafConfig::Prio3Draft09(Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
             bits: 1,
             length: 1000,
             chunk_length: 320,
diff --git a/crates/daphne/benches/pine.rs b/crates/daphne/benches/pine.rs
index e37c8d5..f18d422 100644
--- a/crates/daphne/benches/pine.rs
+++ b/crates/daphne/benches/pine.rs
@@ -3,7 +3,7 @@
 
 use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
 use daphne::pine::Pine;
-use prio::{
+use prio_draft09::{
     field::random_vector,
     flp::Type,
     vdaf::{
diff --git a/crates/daphne/benches/vdaf.rs b/crates/daphne/benches/vdaf.rs
index 1bb7c00..69bed69 100644
--- a/crates/daphne/benches/vdaf.rs
+++ b/crates/daphne/benches/vdaf.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
-use prio::{
+use prio_draft09::{
     field::Field64,
     flp::{
         gadgets::{Mul, ParallelSum},
diff --git a/crates/daphne/src/error/mod.rs b/crates/daphne/src/error/mod.rs
index 0099ac0..7a63ca3 100644
--- a/crates/daphne/src/error/mod.rs
+++ b/crates/daphne/src/error/mod.rs
@@ -41,11 +41,15 @@ impl DapError {
 
     pub(crate) fn from_vdaf(e: VdafError) -> Self {
         match e {
-            VdafError::Codec(..) | VdafError::Vdaf(..) => {
+            VdafError::CodecDraft09(..) | VdafError::VdafDraft09(..) => {
                 tracing::warn!(error = ?e, "rejecting report");
                 Self::Transition(TransitionFailure::VdafPrepError)
             }
             VdafError::Dap(e) => e,
+            VdafError::Codec(..) | VdafError::Vdaf(..) => {
+                tracing::warn!(error = ?e, "rejecting report - latest");
+                Self::Transition(TransitionFailure::VdafPrepError)
+            }
         }
     }
 }
diff --git a/crates/daphne/src/hpke.rs b/crates/daphne/src/hpke.rs
index dd8cd5e..3c067a9 100644
--- a/crates/daphne/src/hpke.rs
+++ b/crates/daphne/src/hpke.rs
@@ -600,7 +600,7 @@ mod test {
     use hpke_rs::{Hpke, HpkePrivateKey, HpkePublicKey, Mode};
     use hpke_rs_crypto::types::{AeadAlgorithm, KdfAlgorithm, KemAlgorithm};
     use hpke_rs_rust_crypto::HpkeRustCrypto as ImplHpkeCrypto;
-    use prio::codec::{Encode as _, ParameterizedEncode as _};
+    use prio::codec::{Encode, ParameterizedEncode};
     use rand::seq::IteratorRandom;
 
     fn encrypt_roundtrip_x25519_hkdf_sha256(version: DapVersion) {
diff --git a/crates/daphne/src/lib.rs b/crates/daphne/src/lib.rs
index 3cf636f..1314a27 100644
--- a/crates/daphne/src/lib.rs
+++ b/crates/daphne/src/lib.rs
@@ -70,13 +70,15 @@ use error::FatalDapError;
 use hpke::{HpkeConfig, HpkeKemId};
 use messages::taskprov::TaskprovAdvertisement;
 #[cfg(feature = "experimental")]
-use prio::codec::Decode;
-#[cfg(feature = "experimental")]
-use prio::vdaf::poplar1::Poplar1AggregationParam;
+use prio::{codec::Decode, vdaf::poplar1::Poplar1AggregationParam};
 use prio::{
     codec::{CodecError, Encode, ParameterizedDecode},
     vdaf::Aggregatable as AggregatableTrait,
 };
+use prio_draft09::{
+    codec::{CodecError as CodecErrorDraft09, ParameterizedDecode as ParameterizedDecodeDraft09},
+    vdaf::Aggregatable as AggregatableTraitDraft09,
+};
 pub use protocol::aggregator::ReplayProtection;
 use serde::{Deserialize, Serialize};
 use std::{
@@ -832,6 +834,25 @@ impl Encode for DapAggregationParam {
     }
 }
 
+impl prio_draft09::codec::Encode for DapAggregationParam {
+    fn encode(&self, bytes: &mut Vec<u8>) -> Result<(), prio_draft09::codec::CodecError> {
+        let _ = bytes;
+        match self {
+            Self::Empty => Ok(()),
+            #[cfg(feature = "experimental")]
+            Self::Mastic(_) => Err(prio_draft09::codec::CodecError::UnexpectedValue),
+        }
+    }
+
+    fn encoded_len(&self) -> Option<usize> {
+        match self {
+            Self::Empty => Some(0),
+            #[cfg(feature = "experimental")]
+            Self::Mastic(agg_param) => agg_param.encoded_len(),
+        }
+    }
+}
+
 impl ParameterizedDecode<VdafConfig> for DapAggregationParam {
     fn decode_with_param(
         vdaf_config: &VdafConfig,
@@ -846,6 +867,20 @@ impl ParameterizedDecode<VdafConfig> for DapAggregationParam {
     }
 }
 
+impl ParameterizedDecodeDraft09<VdafConfig> for DapAggregationParam {
+    fn decode_with_param(
+        vdaf_config: &VdafConfig,
+        bytes: &mut std::io::Cursor<&[u8]>,
+    ) -> Result<Self, CodecErrorDraft09> {
+        let _ = bytes;
+        match vdaf_config {
+            #[cfg(feature = "experimental")]
+            VdafConfig::Mastic { .. } => Err(CodecErrorDraft09::UnexpectedValue),
+            _ => Ok(Self::Empty),
+        }
+    }
+}
+
 /// The aggregate result computed by the Collector.
 #[derive(Debug, PartialEq, Serialize)]
 #[serde(rename_all = "snake_case")]
@@ -903,6 +938,30 @@ impl DapAggregateShare {
             (None, Some(data)) => {
                 self.data = Some(data);
             }
+            (
+                Some(VdafAggregateShare::Field64Draft09(left)),
+                Some(VdafAggregateShare::Field64Draft09(right)),
+            ) => {
+                left.merge(&right).map_err(
+                    |e| fatal_error!(err = ?e, "failed to merge 64bit wide vdaf draft-09 shares"),
+                )?;
+            }
+            (
+                Some(VdafAggregateShare::Field128Draft09(left)),
+                Some(VdafAggregateShare::Field128Draft09(right)),
+            ) => {
+                left.merge(&right).map_err(
+                    |e| fatal_error!(err = ?e, "failed to merge 128bit wide vdaf draft-09 shares"),
+                )?;
+            }
+            (
+                Some(VdafAggregateShare::Field32Draft09(left)),
+                Some(VdafAggregateShare::Field32Draft09(right)),
+            ) => {
+                left.merge(&right).map_err(
+                    |e| fatal_error!(err = ?e, "failed to merge prio2 vdaf draft-09 shares"),
+                )?;
+            }
             (Some(VdafAggregateShare::Field64(left)), Some(VdafAggregateShare::Field64(right))) => {
                 left.merge(&right).map_err(
                     |e| fatal_error!(err = ?e, "failed to merge 64bit wide vdaf shares"),
@@ -920,7 +979,6 @@ impl DapAggregateShare {
                 left.merge(&right)
                     .map_err(|e| fatal_error!(err = ?e, "failed to merge prio2 vdaf shares"))?;
             }
-
             _ => return Err(fatal_error!(err = "invalid aggregate share merge")),
         };
 
diff --git a/crates/daphne/src/pine/flp.rs b/crates/daphne/src/pine/flp.rs
index b81d0dc..b74e688 100644
--- a/crates/daphne/src/pine/flp.rs
+++ b/crates/daphne/src/pine/flp.rs
@@ -33,7 +33,7 @@
 
 use std::marker::PhantomData;
 
-use prio::{
+use prio_draft09::{
     field::FftFriendlyFieldElement,
     flp::{
         gadgets::{Mul, ParallelSum, ParallelSumGadget, PolyEval},
@@ -617,7 +617,7 @@ fn range_checked<F: FftFriendlyFieldElement>(x: F, lower_bound: F, upper_bound:
 
 #[cfg(test)]
 mod tests {
-    use prio::{
+    use prio_draft09::{
         field::{Field128, FieldElement, FieldElementWithInteger},
         flp::{test_utils::FlpTest, Type},
         vdaf::xof::XofTurboShake128,
diff --git a/crates/daphne/src/pine/mod.rs b/crates/daphne/src/pine/mod.rs
index 2eaec2c..bd41640 100644
--- a/crates/daphne/src/pine/mod.rs
+++ b/crates/daphne/src/pine/mod.rs
@@ -15,7 +15,7 @@
 
 use std::marker::PhantomData;
 
-use prio::{
+use prio_draft09::{
     field::{FftFriendlyFieldElement, Field128, Field64},
     vdaf::{xof::XofTurboShake128, VdafError},
 };
@@ -389,7 +389,7 @@ pub mod vdaf;
 
 #[cfg(test)]
 mod tests {
-    use prio::field::Field128;
+    use prio_draft09::field::Field128;
 
     use super::*;
 
diff --git a/crates/daphne/src/pine/msg.rs b/crates/daphne/src/pine/msg.rs
index 8e60d35..443a374 100644
--- a/crates/daphne/src/pine/msg.rs
+++ b/crates/daphne/src/pine/msg.rs
@@ -5,7 +5,7 @@
 
 use std::iter;
 
-use prio::{
+use prio_draft09::{
     codec::{CodecError, Decode, Encode, ParameterizedDecode},
     field::FftFriendlyFieldElement,
     flp::Type,
diff --git a/crates/daphne/src/pine/vdaf.rs b/crates/daphne/src/pine/vdaf.rs
index e59c584..025773e 100644
--- a/crates/daphne/src/pine/vdaf.rs
+++ b/crates/daphne/src/pine/vdaf.rs
@@ -6,7 +6,7 @@
 use std::{borrow::Cow, iter};
 
 use crate::pine::{dst, USAGE_QUERY_RAND};
-use prio::{
+use prio_draft09::{
     codec::{CodecError, Decode, Encode, ParameterizedDecode},
     field::FftFriendlyFieldElement,
     flp::Type,
@@ -755,7 +755,7 @@ impl<F: FftFriendlyFieldElement, X: Xof<SEED_SIZE>, const SEED_SIZE: usize> Coll
 #[cfg(test)]
 mod tests {
 
-    use prio::{
+    use prio_draft09::{
         codec::{Decode, Encode, ParameterizedDecode},
         field::{Field128, Field64},
         vdaf::{
diff --git a/crates/daphne/src/protocol/aggregator.rs b/crates/daphne/src/protocol/aggregator.rs
index b3c928a..ace88d5 100644
--- a/crates/daphne/src/protocol/aggregator.rs
+++ b/crates/daphne/src/protocol/aggregator.rs
@@ -22,11 +22,13 @@ use crate::{
     vdaf::{
         prio2::{prio2_prep_finish, prio2_prep_finish_from_shares},
         prio3::{prio3_prep_finish, prio3_prep_finish_from_shares},
+        prio3_draft09::{prio3_draft09_prep_finish, prio3_draft09_prep_finish_from_shares},
         VdafError,
     },
     AggregationJobReportState, DapAggregateShare, DapAggregateSpan, DapAggregationJobState,
     DapAggregationParam, DapError, DapTaskConfig, DapVersion, VdafConfig,
 };
+
 use prio::codec::{encode_u32_items, Encode, ParameterizedDecode, ParameterizedEncode};
 use rayon::iter::{IntoParallelIterator, ParallelIterator as _};
 use std::{
@@ -277,6 +279,7 @@ impl DapTaskConfig {
     #[tracing::instrument(skip_all, fields(report_count = report_status.len()))]
     pub(crate) fn produce_agg_job_resp(
         &self,
+        task_id: TaskId,
         report_status: &HashMap<ReportId, ReportProcessedStatus>,
         part_batch_sel: &PartialBatchSelector,
         initialized_reports: &[InitializedReport<WithPeerPrepShare>],
@@ -298,9 +301,19 @@ impl DapTaskConfig {
                         prep_state: helper_prep_state,
                     } => {
                         let res = match &self.vdaf {
+                            VdafConfig::Prio3Draft09(prio3_config) => {
+                                prio3_draft09_prep_finish_from_shares(
+                                    prio3_config,
+                                    1,
+                                    helper_prep_state.clone(),
+                                    helper_prep_share.clone(),
+                                    leader_prep_share,
+                                )
+                            }
                             VdafConfig::Prio3(prio3_config) => prio3_prep_finish_from_shares(
                                 prio3_config,
                                 1,
+                                task_id,
                                 helper_prep_state.clone(),
                                 helper_prep_share.clone(),
                                 leader_prep_share,
@@ -352,7 +365,12 @@ impl DapTaskConfig {
                                 TransitionVar::Continued(outbound)
                             }
 
-                            Err(e @ (VdafError::Codec(..) | VdafError::Vdaf(..))) => {
+                            Err(
+                                e @ (VdafError::CodecDraft09(..)
+                                | VdafError::VdafDraft09(..)
+                                | VdafError::Codec(..)
+                                | VdafError::Vdaf(..)),
+                            ) => {
                                 tracing::warn!(error = ?e, "rejecting report");
                                 TransitionVar::Failed(TransitionFailure::VdafPrepError)
                             }
@@ -438,8 +456,11 @@ impl DapTaskConfig {
             };
 
             let res = match &self.vdaf {
+                VdafConfig::Prio3Draft09(prio3_config) => {
+                    prio3_draft09_prep_finish(prio3_config, leader.prep_state, prep_msg)
+                }
                 VdafConfig::Prio3(prio3_config) => {
-                    prio3_prep_finish(prio3_config, leader.prep_state, prep_msg)
+                    prio3_prep_finish(prio3_config, leader.prep_state, prep_msg, *task_id)
                 }
                 VdafConfig::Prio2 { dimension } => {
                     prio2_prep_finish(*dimension, leader.prep_state, prep_msg)
@@ -460,12 +481,16 @@ impl DapTaskConfig {
                     )?;
                 }
 
-                Err(e @ (VdafError::Codec(..) | VdafError::Vdaf(..))) => {
+                Err(
+                    e @ (VdafError::CodecDraft09(..)
+                    | VdafError::VdafDraft09(..)
+                    | VdafError::Codec(..)
+                    | VdafError::Vdaf(..)),
+                ) => {
                     tracing::warn!(error = ?e, "rejecting report");
                     metrics
                         .report_inc_by(ReportStatus::Rejected(TransitionFailure::VdafPrepError), 1);
                 }
-
                 Err(VdafError::Dap(e)) => return Err(e),
             }
         }
diff --git a/crates/daphne/src/protocol/client.rs b/crates/daphne/src/protocol/client.rs
index 7559f22..97a5b66 100644
--- a/crates/daphne/src/protocol/client.rs
+++ b/crates/daphne/src/protocol/client.rs
@@ -7,7 +7,7 @@ use crate::{
     constants::DapAggregatorRole,
     hpke::{info_and_aad, HpkeConfig},
     messages::{Extension, PlaintextInputShare, Report, ReportId, ReportMetadata, TaskId, Time},
-    vdaf::{prio2::prio2_shard, prio3::prio3_shard, VdafError},
+    vdaf::{prio2::prio2_shard, prio3::prio3_shard, prio3_draft09::prio3_draft09_shard, VdafError},
     DapError, DapMeasurement, DapVersion, VdafConfig,
 };
 use prio::codec::ParameterizedEncode;
@@ -45,7 +45,7 @@ impl VdafConfig {
         let mut rng = thread_rng();
         let report_id = ReportId(rng.gen());
         let (public_share, input_shares) = self
-            .produce_input_shares(measurement, &report_id.0)
+            .produce_input_shares(measurement, &report_id.0, task_id)
             .map_err(DapError::from_vdaf)?;
         Self::produce_report_with_extensions_for_shares(
             public_share,
@@ -121,9 +121,15 @@ impl VdafConfig {
         &self,
         measurement: DapMeasurement,
         nonce: &[u8; 16],
+        task_id: &TaskId,
     ) -> Result<(Vec<u8>, [Vec<u8>; 2]), VdafError> {
         match self {
-            Self::Prio3(prio3_config) => Ok(prio3_shard(prio3_config, measurement, nonce)?),
+            Self::Prio3Draft09(prio3_config) => {
+                Ok(prio3_draft09_shard(prio3_config, measurement, nonce)?)
+            }
+            Self::Prio3(prio3_config) => {
+                Ok(prio3_shard(prio3_config, measurement, nonce, *task_id)?)
+            }
             Self::Prio2 { dimension } => Ok(prio2_shard(*dimension, measurement, nonce)?),
             #[cfg(feature = "experimental")]
             VdafConfig::Mastic {
diff --git a/crates/daphne/src/protocol/collector.rs b/crates/daphne/src/protocol/collector.rs
index c143b09..3dfca90 100644
--- a/crates/daphne/src/protocol/collector.rs
+++ b/crates/daphne/src/protocol/collector.rs
@@ -8,7 +8,7 @@ use crate::{
     fatal_error,
     hpke::{info_and_aad, HpkeDecrypter},
     messages::{BatchSelector, HpkeCiphertext, TaskId},
-    vdaf::{prio2::prio2_unshard, prio3::prio3_unshard},
+    vdaf::{prio2::prio2_unshard, prio3::prio3_unshard, prio3_draft09::prio3_draft09_unshard},
     DapAggregateResult, DapAggregationParam, DapError, DapVersion, VdafConfig,
 };
 
@@ -73,6 +73,9 @@ impl VdafConfig {
 
         let num_measurements = usize::try_from(report_count).unwrap();
         match self {
+            Self::Prio3Draft09(prio3_config) => {
+                prio3_draft09_unshard(prio3_config, num_measurements, agg_shares)
+            }
             Self::Prio3(prio3_config) => prio3_unshard(prio3_config, num_measurements, agg_shares),
             Self::Prio2 { dimension } => prio2_unshard(*dimension, num_measurements, agg_shares),
             #[cfg(feature = "experimental")]
diff --git a/crates/daphne/src/protocol/mod.rs b/crates/daphne/src/protocol/mod.rs
index 6c504f9..6befbe1 100644
--- a/crates/daphne/src/protocol/mod.rs
+++ b/crates/daphne/src/protocol/mod.rs
@@ -81,16 +81,24 @@ mod test {
     use hpke_rs::HpkePublicKey;
     use prio::{
         codec::encode_u32_items,
-        field::Field64,
         vdaf::{
-            prio3::Prio3, AggregateShare, Aggregator as VdafAggregator, Collector as VdafCollector,
-            OutputShare, PrepareTransition,
+            prio3::Prio3, Aggregator as VdafAggregator, Collector as VdafCollector,
+            PrepareTransition,
+        },
+    };
+    use prio_draft09::{
+        field::Field64 as Field64Draft09,
+        vdaf::{
+            prio3::Prio3 as Prio3Draft09, AggregateShare as AggregateShareDraft09,
+            Aggregator as VdafAggregatorDraft09, Collector as VdafCollectorDraft09,
+            OutputShare as OutputShareDraft09, PrepareTransition as PrepareTransitionDraft09,
         },
     };
     use rand::prelude::*;
     use std::iter::zip;
 
     const TEST_VDAF: &VdafConfig = &VdafConfig::Prio3(Prio3Config::Count);
+    const TEST_VDAF_DRAFT09: &VdafConfig = &VdafConfig::Prio3Draft09(Prio3Config::Count);
 
     fn roundtrip_report(version: DapVersion) {
         let t = AggregationJobTest::new(TEST_VDAF, HpkeKemId::X25519HkdfSha256, version);
@@ -168,19 +176,21 @@ mod test {
                 VdafPrepShare::Prio3Field64(leader_share),
                 VdafPrepShare::Prio3Field64(helper_share),
             ) => {
+                let ctx = &["dap-13".as_bytes(), &t.task_id.0].concat();
+                //let ctx = binding.as_slice();
                 let vdaf = Prio3::new_count(2).unwrap();
                 let message = vdaf
-                    .prepare_shares_to_prepare_message(&(), [leader_share, helper_share])
+                    .prepare_shares_to_prepare_message(ctx, &(), [leader_share, helper_share])
                     .unwrap();
 
                 let leader_out_share = assert_matches!(
-                    vdaf.prepare_next(leader_step, message.clone()).unwrap(),
+                    vdaf.prepare_next(ctx, leader_step, message.clone()).unwrap(),
                     PrepareTransition::Finish(out_share) => out_share
                 );
                 let leader_agg_share = vdaf.aggregate(&(), [leader_out_share]).unwrap();
 
                 let helper_out_share = assert_matches!(
-                    vdaf.prepare_next(helper_step, message).unwrap(),
+                    vdaf.prepare_next(ctx, helper_step, message).unwrap(),
                     PrepareTransition::Finish(out_share) => out_share
                 );
                 let helper_agg_share = vdaf.aggregate(&(), [helper_out_share]).unwrap();
@@ -199,6 +209,113 @@ mod test {
 
     test_versions! { roundtrip_report }
 
+    #[test]
+    fn roundtrip_report_vdaf_draft09() {
+        let version = DapVersion::Draft09;
+        let t = AggregationJobTest::new(TEST_VDAF_DRAFT09, HpkeKemId::X25519HkdfSha256, version);
+        let report = t
+            .task_config
+            .vdaf
+            .produce_report(
+                &t.client_hpke_config_list,
+                t.now,
+                &t.task_id,
+                DapMeasurement::U64(1),
+                t.task_config.version,
+            )
+            .unwrap();
+
+        let [leader_share, helper_share] = report.encrypted_input_shares;
+
+        let InitializedReport::Ready {
+            prep_share: leader_prep_share,
+            prep_state: leader_prep_state,
+            ..
+        } = InitializedReport::from_client(
+            &t.leader_hpke_receiver_config,
+            t.valid_report_time_range(),
+            &t.task_id,
+            &t.task_config,
+            ReportShare {
+                report_metadata: report.report_metadata.clone(),
+                public_share: report.public_share.clone(),
+                encrypted_input_share: leader_share,
+            },
+            &DapAggregationParam::Empty,
+        )
+        .unwrap()
+        else {
+            panic!("rejected unexpectedly");
+        };
+
+        let InitializedReport::Ready {
+            prep_share: helper_prep_share,
+            prep_state: helper_prep_state,
+            ..
+        } = InitializedReport::from_leader(
+            &t.helper_hpke_receiver_config,
+            t.valid_report_time_range(),
+            &t.task_id,
+            &t.task_config,
+            ReportShare {
+                report_metadata: report.report_metadata,
+                public_share: report.public_share,
+                encrypted_input_share: helper_share,
+            },
+            {
+                let mut outbound = Vec::new();
+                outbound.push(PingPongMessageType::Initialize as u8);
+                encode_u32_items(&mut outbound, &version, &[leader_prep_share.clone()]).unwrap();
+                outbound
+            },
+            &DapAggregationParam::Empty,
+        )
+        .unwrap()
+        else {
+            panic!("rejected unexpectedly");
+        };
+
+        match (
+            leader_prep_state,
+            helper_prep_state,
+            leader_prep_share,
+            helper_prep_share,
+        ) {
+            (
+                VdafPrepState::Prio3Draft09Field64(leader_step),
+                VdafPrepState::Prio3Draft09Field64(helper_step),
+                VdafPrepShare::Prio3Draft09Field64(leader_share),
+                VdafPrepShare::Prio3Draft09Field64(helper_share),
+            ) => {
+                let vdaf = Prio3Draft09::new_count(2).unwrap();
+                let message = vdaf
+                    .prepare_shares_to_prepare_message(&(), [leader_share, helper_share])
+                    .unwrap();
+
+                let leader_out_share = assert_matches!(
+                    vdaf.prepare_next(leader_step, message.clone()).unwrap(),
+                    PrepareTransitionDraft09::Finish(out_share) => out_share
+                );
+                let leader_agg_share = vdaf.aggregate(&(), [leader_out_share]).unwrap();
+
+                let helper_out_share = assert_matches!(
+                    vdaf.prepare_next(helper_step, message).unwrap(),
+                    PrepareTransitionDraft09::Finish(out_share) => out_share
+                );
+                let helper_agg_share = vdaf.aggregate(&(), [helper_out_share]).unwrap();
+
+                assert_eq!(
+                    vdaf.unshard(&(), vec![leader_agg_share, helper_agg_share], 1)
+                        .unwrap(),
+                    1,
+                );
+            }
+            _ => {
+                panic!("unexpected output from leader or helper");
+            }
+        }
+    }
+
     fn roundtrip_report_unsupported_hpke_suite(version: DapVersion) {
         let t = AggregationJobTest::new(TEST_VDAF, HpkeKemId::X25519HkdfSha256, version);
 
@@ -595,6 +712,51 @@ mod test {
 
     test_versions! { agg_job_resp_abort_invalid_transition }
 
+    #[test]
+    fn finish_agg_job_vdaf_draft09() {
+        let version = DapVersion::Draft09;
+        let t = AggregationJobTest::new(TEST_VDAF_DRAFT09, HpkeKemId::X25519HkdfSha256, version);
+        let reports = t.produce_reports(vec![
+            DapMeasurement::U64(1),
+            DapMeasurement::U64(1),
+            DapMeasurement::U64(0),
+            DapMeasurement::U64(0),
+            DapMeasurement::U64(1),
+        ]);
+
+        let (leader_state, agg_job_init_req) =
+            t.produce_agg_job_req(&DapAggregationParam::Empty, reports);
+
+        let (leader_agg_span, helper_agg_span) = {
+            let (helper_agg_span, agg_job_resp) = t.handle_agg_job_req(agg_job_init_req);
+            let leader_agg_span = t.consume_agg_job_resp(leader_state, agg_job_resp);
+
+            (leader_agg_span, helper_agg_span)
+        };
+
+        assert_eq!(leader_agg_span.report_count(), 5);
+        let num_measurements = leader_agg_span.report_count();
+
+        let VdafAggregateShare::Field64Draft09(leader_agg_share) =
+            leader_agg_span.collapsed().data.unwrap()
+        else {
+            panic!("unexpected VdafAggregateShare variant")
+        };
+
+        let VdafAggregateShare::Field64Draft09(helper_agg_share) =
+            helper_agg_span.collapsed().data.unwrap()
+        else {
+            panic!("unexpected VdafAggregateShare variant")
+        };
+
+        let vdaf = Prio3Draft09::new_count(2).unwrap();
+        assert_eq!(
+            vdaf.unshard(&(), [leader_agg_share, helper_agg_share], num_measurements,)
+                .unwrap(),
+            3,
+        );
+    }
+
     fn finish_agg_job(version: DapVersion) {
         let t = AggregationJobTest::new(TEST_VDAF, HpkeKemId::X25519HkdfSha256, version);
         let reports = t.produce_reports(vec![
@@ -676,18 +838,22 @@ mod test {
             min_time: 1_637_359_200,
             max_time: 1_637_359_200,
             checksum: [0; 32],
-            data: Some(VdafAggregateShare::Field64(AggregateShare::from(
-                OutputShare::from(vec![Field64::from(23)]),
-            ))),
+            data: Some(VdafAggregateShare::Field64Draft09(
+                AggregateShareDraft09::from(OutputShareDraft09::from(vec![Field64Draft09::from(
+                    23,
+                )])),
+            )),
         };
         let helper_agg_share = DapAggregateShare {
             report_count: 50,
             min_time: 1_637_359_200,
             max_time: 1_637_359_200,
             checksum: [0; 32],
-            data: Some(VdafAggregateShare::Field64(AggregateShare::from(
-                OutputShare::from(vec![Field64::from(9)]),
-            ))),
+            data: Some(VdafAggregateShare::Field64Draft09(
+                AggregateShareDraft09::from(OutputShareDraft09::from(vec![Field64Draft09::from(
+                    9,
+                )])),
+            )),
         };
 
         let batch_selector = BatchSelector::TimeInterval {
@@ -817,7 +983,7 @@ mod test {
             let (invalid_public_share, mut invalid_input_shares) = self
                 .task_config
                 .vdaf
-                .produce_input_shares(measurement, &report_id.0)
+                .produce_input_shares(measurement, &report_id.0, &self.task_id)
                 .unwrap();
             invalid_input_shares[1][0] ^= 1; // The first bit is incorrect!
             VdafConfig::produce_report_with_extensions_for_shares(
@@ -843,7 +1009,7 @@ mod test {
             let (mut invalid_public_share, invalid_input_shares) = self
                 .task_config
                 .vdaf
-                .produce_input_shares(measurement, &report_id.0)
+                .produce_input_shares(measurement, &report_id.0, &self.task_id)
                 .unwrap();
             invalid_public_share.push(1); // Add spurious byte at the end
             VdafConfig::produce_report_with_extensions_for_shares(
@@ -869,7 +1035,7 @@ mod test {
             let (invalid_public_share, mut invalid_input_shares) = self
                 .task_config
                 .vdaf
-                .produce_input_shares(measurement, &report_id.0)
+                .produce_input_shares(measurement, &report_id.0, &self.task_id)
                 .unwrap();
             invalid_input_shares[0].push(1); // Add a spurious byte to the Leader's share
             invalid_input_shares[1].push(1); // Add a spurious byte to the Helper's share
diff --git a/crates/daphne/src/protocol/report_init.rs b/crates/daphne/src/protocol/report_init.rs
index e6578d3..377298d 100644
--- a/crates/daphne/src/protocol/report_init.rs
+++ b/crates/daphne/src/protocol/report_init.rs
@@ -12,7 +12,8 @@ use crate::{
     },
     protocol::{decode_ping_pong_framed, no_duplicates, PingPongMessageType},
     vdaf::{
-        prio2::prio2_prep_init, prio3::prio3_prep_init, VdafConfig, VdafPrepShare, VdafPrepState,
+        prio2::prio2_prep_init, prio3::prio3_prep_init, prio3_draft09::prio3_draft09_prep_init,
+        VdafConfig, VdafPrepShare, VdafPrepState,
     },
     DapAggregationParam, DapError, DapTaskConfig,
 };
@@ -197,9 +198,18 @@ impl<P> InitializedReport<P> {
             DapAggregatorRole::Helper => 1,
         };
         let res = match &task_config.vdaf {
+            VdafConfig::Prio3Draft09(ref prio3_config) => prio3_draft09_prep_init(
+                prio3_config,
+                &task_config.vdaf_verify_key,
+                agg_id,
+                &report_share.report_metadata.id.0,
+                &report_share.public_share,
+                &input_share,
+            ),
             VdafConfig::Prio3(ref prio3_config) => prio3_prep_init(
                 prio3_config,
                 &task_config.vdaf_verify_key,
+                *task_id,
                 agg_id,
                 &report_share.report_metadata.id.0,
                 &report_share.public_share,
diff --git a/crates/daphne/src/roles/helper.rs b/crates/daphne/src/roles/helper.rs
index f72aa42..a5e3ef1 100644
--- a/crates/daphne/src/roles/helper.rs
+++ b/crates/daphne/src/roles/helper.rs
@@ -228,6 +228,7 @@ async fn finish_agg_job_and_aggregate(
     let mut report_status = HashMap::new();
     for _ in 0..RETRY_COUNT {
         let (agg_span, agg_job_resp) = task_config.produce_agg_job_resp(
+            *task_id,
             &report_status,
             part_batch_sel,
             initialized_reports,
diff --git a/crates/daphne/src/roles/mod.rs b/crates/daphne/src/roles/mod.rs
index d24ea9b..860272c 100644
--- a/crates/daphne/src/roles/mod.rs
+++ b/crates/daphne/src/roles/mod.rs
@@ -198,7 +198,7 @@ mod test {
             };
 
             // Task Parameters that the Leader and Helper must agree on.
-            let vdaf_config = VdafConfig::Prio3(Prio3Config::Count);
+            let vdaf_config = VdafConfig::Prio3Draft09(Prio3Config::Count);
             let leader_url = Url::parse("https://leader.com/v02/").unwrap();
             let helper_url = Url::parse("http://helper.org:8788/v02/").unwrap();
             let collector_hpke_receiver_config =
@@ -486,7 +486,10 @@ mod test {
             // Construct report. We expect the VDAF to be Prio3Count so that we know what type of
             // measurement to generate. However, we could extend the code to support more VDAFs.
             let task_config = self.leader.unchecked_get_task_config(task_id).await;
-            assert_matches!(task_config.vdaf, VdafConfig::Prio3(Prio3Config::Count));
+            assert_matches!(
+                task_config.vdaf,
+                VdafConfig::Prio3Draft09(Prio3Config::Count)
+            );
 
             self.gen_test_report_for_measurement(task_id, DapMeasurement::U64(1))
                 .await
@@ -1527,7 +1530,7 @@ mod test {
     async fn e2e_taskprov_prio3_sum_vec_field64_multiproof_hmac_sha256_aes128(version: DapVersion) {
         e2e_taskprov(
             version,
-            VdafConfig::Prio3(Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
+            VdafConfig::Prio3Draft09(Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
                 bits: 1,
                 length: 10,
                 chunk_length: 2,
diff --git a/crates/daphne/src/taskprov.rs b/crates/daphne/src/taskprov.rs
index f52f711..71a87bd 100644
--- a/crates/daphne/src/taskprov.rs
+++ b/crates/daphne/src/taskprov.rs
@@ -197,7 +197,7 @@ impl VdafConfig {
                         task_id: *task_id,
                     });
                 }
-                Ok(VdafConfig::Prio3(
+                Ok(VdafConfig::Prio3Draft09(
                     Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
                         bits: bits.into(),
                         length: length.try_into().map_err(|_| DapAbort::InvalidTask {
@@ -373,6 +373,27 @@ impl TryFrom<&VdafConfig> for messages::taskprov::VdafTypeVar {
                     fatal_error!(err = "{vdaf_config}: dimension is too large for taskprov")
                 })?,
             }),
+            VdafConfig::Prio3Draft09(Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
+                bits,
+                length,
+                chunk_length,
+                num_proofs,
+            }) => Ok(Self::Prio3SumVecField64MultiproofHmacSha256Aes128 {
+                bits: (*bits).try_into().map_err(|_| {
+                    fatal_error!(err = format!("{vdaf_config}: bits is too large for taskprov"))
+                })?,
+                length: (*length).try_into().map_err(|_| {
+                    fatal_error!(err = format!("{vdaf_config}: bits is too large for taskprov"))
+                })?,
+
+                chunk_length: (*chunk_length).try_into().map_err(|_| {
+                    fatal_error!(err = format!("{vdaf_config}: bits is too large for taskprov"))
+                })?,
+                num_proofs: *num_proofs,
+            }),
+            VdafConfig::Prio3Draft09(..) => Err(fatal_error!(
+                err = format!("{vdaf_config} is not currently supported for taskprov")
+            )),
             VdafConfig::Prio3(Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
                 bits,
                 length,
diff --git a/crates/daphne/src/vdaf/mastic.rs b/crates/daphne/src/vdaf/mastic.rs
index 8d12475..0918998 100644
--- a/crates/daphne/src/vdaf/mastic.rs
+++ b/crates/daphne/src/vdaf/mastic.rs
@@ -16,7 +16,7 @@ use super::{
 };
 
 use prio::{
-    codec::Decode,
+    codec::{CodecError, Decode},
     field::{Field64, FieldElement},
     vdaf::AggregateShare,
 };
@@ -92,7 +92,7 @@ pub(crate) fn mastic_prep_init(
             }
 
             if input_share_bytes.len() != 1 {
-                return Err(VdafError::Codec(prio::codec::CodecError::Other(
+                return Err(VdafError::Codec(CodecError::Other(
                     "mastic: malformed input share".into(),
                 )));
             }
@@ -104,7 +104,7 @@ pub(crate) fn mastic_prep_init(
                 .map(|prefix| {
                     let prefix_bytes = prefix.to_bytes();
                     if prefix_bytes.len() > input_size {
-                        return Err(VdafError::Codec(prio::codec::CodecError::Other(
+                        return Err(VdafError::Codec(CodecError::Other(
                             "mastic: malformed agg param: path with invalid length".into(),
                         )));
                     }
diff --git a/crates/daphne/src/vdaf/mod.rs b/crates/daphne/src/vdaf/mod.rs
index bf35f1b..24c2d20 100644
--- a/crates/daphne/src/vdaf/mod.rs
+++ b/crates/daphne/src/vdaf/mod.rs
@@ -9,19 +9,41 @@ pub(crate) mod mastic;
 pub(crate) mod pine;
 pub(crate) mod prio2;
 pub(crate) mod prio3;
+pub(crate) mod prio3_draft09;
 
 use crate::pine::vdaf::PinePrepState;
-use crate::{fatal_error, DapError};
+use crate::{fatal_error, messages::TaskId, DapError};
 use pine::PineConfig;
-#[cfg(any(test, feature = "test-utils", feature = "experimental"))]
-use prio::field::FieldElement;
 use prio::{
     codec::{CodecError, Encode, ParameterizedDecode},
     field::{Field128, Field64, FieldPrio2},
     vdaf::{
-        prio2::{Prio2PrepareShare, Prio2PrepareState},
         prio3::{Prio3PrepareShare, Prio3PrepareState},
-        Aggregator, Client, Collector, PrepareTransition, Vdaf,
+        AggregateShare, Aggregator, Client, Collector, PrepareTransition, Vdaf,
+    },
+};
+
+#[cfg(feature = "experimental")]
+use prio::field::FieldElement;
+#[cfg(any(test, feature = "test-utils"))]
+use prio_draft09::field::FieldElement as FieldElementDraft09;
+use prio_draft09::{
+    codec::{
+        CodecError as CodecErrorDraft09, Encode as EncodeDraft09,
+        ParameterizedDecode as ParameterizedDecodeDraft09,
+    },
+    field::{
+        Field128 as Field128Draft09, Field64 as Field64Draft09, FieldPrio2 as FieldPrio2Draft09,
+    },
+    vdaf::{
+        prio2::{Prio2PrepareShare, Prio2PrepareState},
+        prio3::{
+            Prio3PrepareShare as Prio3Draft09PrepareShare,
+            Prio3PrepareState as Prio3Draft09PrepareState,
+        },
+        AggregateShare as AggregateShareDraft09, Aggregator as AggregatorDraft09,
+        Client as ClientDraft09, Collector as CollectorDraft09,
+        PrepareTransition as PrepareTransitionDraft09, Vdaf as VdafDraft09,
     },
 };
 use rand::prelude::*;
@@ -33,8 +55,14 @@ use std::io::Read;
 #[cfg(feature = "experimental")]
 pub use self::mastic::MasticWeightConfig;
 
+const CTX_STRING_PREFIX: &[u8] = b"dap-13";
+
 #[derive(Debug, thiserror::Error)]
 pub(crate) enum VdafError {
+    #[error("{0}")]
+    CodecDraft09(#[from] CodecErrorDraft09),
+    #[error("{0}")]
+    VdafDraft09(#[from] prio_draft09::vdaf::VdafError),
     #[error("{0}")]
     Codec(#[from] CodecError),
     #[error("{0}")]
@@ -48,6 +76,7 @@ pub(crate) enum VdafError {
 #[serde(rename_all = "snake_case")]
 #[cfg_attr(any(test, feature = "test-utils"), derive(deepsize::DeepSizeOf))]
 pub enum VdafConfig {
+    Prio3Draft09(Prio3Config),
     Prio3(Prio3Config),
     Prio2 {
         dimension: usize,
@@ -71,9 +100,21 @@ impl std::str::FromStr for VdafConfig {
     }
 }
 
+pub(crate) fn from_codec_error(c: CodecErrorDraft09) -> CodecError {
+    match c {
+        CodecErrorDraft09::Io(x) => CodecError::Io(x),
+        CodecErrorDraft09::BytesLeftOver(u) => CodecError::BytesLeftOver(u),
+        CodecErrorDraft09::LengthPrefixTooBig(u) => CodecError::LengthPrefixTooBig(u),
+        CodecErrorDraft09::LengthPrefixOverflow => CodecError::LengthPrefixOverflow,
+        CodecErrorDraft09::Other(x) => CodecError::Other(x),
+        _ => CodecError::UnexpectedValue,
+    }
+}
+
 impl std::fmt::Display for VdafConfig {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
+            VdafConfig::Prio3Draft09(prio3_config) => write!(f, "Prio3Draft09({prio3_config})"),
             VdafConfig::Prio3(prio3_config) => write!(f, "Prio3({prio3_config})"),
             VdafConfig::Prio2 { dimension } => write!(f, "Prio2({dimension})"),
             #[cfg(feature = "experimental")]
@@ -192,6 +233,9 @@ impl AsMut<[u8]> for VdafVerifyKey {
 #[cfg_attr(any(test, feature = "test-utils"), derive(Debug, Eq, PartialEq))]
 pub enum VdafPrepState {
     Prio2(Prio2PrepareState),
+    Prio3Draft09Field64(Prio3Draft09PrepareState<Field64Draft09, 16>),
+    Prio3Draft09Field64HmacSha256Aes128(Prio3Draft09PrepareState<Field64Draft09, 32>),
+    Prio3Draft09Field128(Prio3Draft09PrepareState<Field128Draft09, 16>),
     Prio3Field64(Prio3PrepareState<Field64, 16>),
     Prio3Field64HmacSha256Aes128(Prio3PrepareState<Field64, 32>),
     Prio3Field128(Prio3PrepareState<Field128, 16>),
@@ -199,8 +243,8 @@ pub enum VdafPrepState {
     Mastic {
         out_share: Vec<Field64>,
     },
-    Pine64HmacSha256Aes128(PinePrepState<Field64, 32>),
-    Pine32HmacSha256Aes128(PinePrepState<FieldPrio2, 32>),
+    Pine64HmacSha256Aes128(PinePrepState<Field64Draft09, 32>),
+    Pine32HmacSha256Aes128(PinePrepState<FieldPrio2Draft09, 32>),
 }
 
 #[cfg(any(test, feature = "test-utils"))]
@@ -212,6 +256,9 @@ impl deepsize::DeepSizeOf for VdafPrepState {
         // This happens to be correct for helpers but not for leaders
         match self {
             Self::Prio2(_)
+            | Self::Prio3Draft09Field64(_)
+            | Self::Prio3Draft09Field64HmacSha256Aes128(_)
+            | Self::Prio3Draft09Field128(_)
             | Self::Prio3Field64(_)
             | Self::Prio3Field64HmacSha256Aes128(_)
             | Self::Prio3Field128(_)
@@ -228,13 +275,17 @@ impl deepsize::DeepSizeOf for VdafPrepState {
 #[cfg_attr(any(test, feature = "test-utils"), derive(Debug))]
 pub enum VdafPrepShare {
     Prio2(Prio2PrepareShare),
+    Prio3Draft09Field64(Prio3Draft09PrepareShare<Field64Draft09, 16>),
+    Prio3Draft09Field64HmacSha256Aes128(Prio3Draft09PrepareShare<Field64Draft09, 32>),
+    Prio3Draft09Field128(Prio3Draft09PrepareShare<Field128Draft09, 16>),
+
     Prio3Field64(Prio3PrepareShare<Field64, 16>),
     Prio3Field64HmacSha256Aes128(Prio3PrepareShare<Field64, 32>),
     Prio3Field128(Prio3PrepareShare<Field128, 16>),
     #[cfg(feature = "experimental")]
     Mastic(Field64),
-    Pine64HmacSha256Aes128(crate::pine::msg::PrepShare<Field64, 32>),
-    Pine32HmacSha256Aes128(crate::pine::msg::PrepShare<FieldPrio2, 32>),
+    Pine64HmacSha256Aes128(crate::pine::msg::PrepShare<Field64Draft09, 32>),
+    Pine32HmacSha256Aes128(crate::pine::msg::PrepShare<FieldPrio2Draft09, 32>),
 }
 
 #[cfg(any(test, feature = "test-utils"))]
@@ -242,13 +293,16 @@ impl deepsize::DeepSizeOf for VdafPrepShare {
     fn deep_size_of_children(&self, _context: &mut deepsize::Context) -> usize {
         match self {
             // The Prio2 prep share consists of three field elements.
-            Self::Prio2(_msg) => 3 * FieldPrio2::ENCODED_SIZE,
+            Self::Prio2(_msg) => 3 * FieldPrio2Draft09::ENCODED_SIZE,
             // The Prio3 prep share consists of an optional XOF seed for the Aggregator's joint
             // randomness part and a sequence of field elements for the Aggregator's verifier
             // share. The length of the verifier share depends on the Prio3 type, which we don't
             // know at this point. Likewise, whether the XOF seed is present depends on the Prio3
             // type.
-            Self::Prio3Field64(..)
+            Self::Prio3Draft09Field64(..)
+            | Self::Prio3Draft09Field64HmacSha256Aes128(..)
+            | Self::Prio3Draft09Field128(..)
+            | Self::Prio3Field64(..)
             | Self::Prio3Field64HmacSha256Aes128(..)
             | Self::Prio3Field128(..)
             | Self::Pine64HmacSha256Aes128(_)
@@ -262,14 +316,19 @@ impl deepsize::DeepSizeOf for VdafPrepShare {
 impl Encode for VdafPrepShare {
     fn encode(&self, bytes: &mut Vec<u8>) -> Result<(), CodecError> {
         match self {
+            Self::Prio3Draft09Field64(share) => share.encode(bytes).map_err(from_codec_error),
+            Self::Prio3Draft09Field64HmacSha256Aes128(share) => {
+                share.encode(bytes).map_err(from_codec_error)
+            }
+            Self::Prio3Draft09Field128(share) => share.encode(bytes).map_err(from_codec_error),
             Self::Prio3Field64(share) => share.encode(bytes),
             Self::Prio3Field64HmacSha256Aes128(share) => share.encode(bytes),
             Self::Prio3Field128(share) => share.encode(bytes),
-            Self::Prio2(share) => share.encode(bytes),
+            Self::Prio2(share) => share.encode(bytes).map_err(from_codec_error),
             #[cfg(feature = "experimental")]
             Self::Mastic(share) => share.encode(bytes),
-            Self::Pine64HmacSha256Aes128(share) => share.encode(bytes),
-            Self::Pine32HmacSha256Aes128(share) => share.encode(bytes),
+            Self::Pine64HmacSha256Aes128(share) => share.encode(bytes).map_err(from_codec_error),
+            Self::Pine32HmacSha256Aes128(share) => share.encode(bytes).map_err(from_codec_error),
         }
     }
 }
@@ -280,6 +339,20 @@ impl ParameterizedDecode<VdafPrepState> for VdafPrepShare {
         bytes: &mut std::io::Cursor<&[u8]>,
     ) -> Result<Self, CodecError> {
         match state {
+            VdafPrepState::Prio3Draft09Field64(state) => Ok(VdafPrepShare::Prio3Draft09Field64(
+                Prio3Draft09PrepareShare::decode_with_param(state, bytes)
+                    .map_err(from_codec_error)?,
+            )),
+            VdafPrepState::Prio3Draft09Field64HmacSha256Aes128(state) => {
+                Ok(VdafPrepShare::Prio3Draft09Field64HmacSha256Aes128(
+                    Prio3Draft09PrepareShare::decode_with_param(state, bytes)
+                        .map_err(from_codec_error)?,
+                ))
+            }
+            VdafPrepState::Prio3Draft09Field128(state) => Ok(VdafPrepShare::Prio3Draft09Field128(
+                Prio3Draft09PrepareShare::decode_with_param(state, bytes)
+                    .map_err(from_codec_error)?,
+            )),
             VdafPrepState::Prio3Field64(state) => Ok(VdafPrepShare::Prio3Field64(
                 Prio3PrepareShare::decode_with_param(state, bytes)?,
             )),
@@ -292,7 +365,7 @@ impl ParameterizedDecode<VdafPrepState> for VdafPrepShare {
                 Prio3PrepareShare::decode_with_param(state, bytes)?,
             )),
             VdafPrepState::Prio2(state) => Ok(VdafPrepShare::Prio2(
-                Prio2PrepareShare::decode_with_param(state, bytes)?,
+                Prio2PrepareShare::decode_with_param(state, bytes).map_err(from_codec_error)?,
             )),
             #[cfg(feature = "experimental")]
             VdafPrepState::Mastic { .. } => {
@@ -300,12 +373,14 @@ impl ParameterizedDecode<VdafPrepState> for VdafPrepShare {
             }
             VdafPrepState::Pine64HmacSha256Aes128(state) => {
                 Ok(VdafPrepShare::Pine64HmacSha256Aes128(
-                    crate::pine::msg::PrepShare::decode_with_param(state, bytes)?,
+                    crate::pine::msg::PrepShare::decode_with_param(state, bytes)
+                        .map_err(from_codec_error)?,
                 ))
             }
             VdafPrepState::Pine32HmacSha256Aes128(state) => {
                 Ok(VdafPrepShare::Pine32HmacSha256Aes128(
-                    crate::pine::msg::PrepShare::decode_with_param(state, bytes)?,
+                    crate::pine::msg::PrepShare::decode_with_param(state, bytes)
+                        .map_err(from_codec_error)?,
                 ))
             }
         }
@@ -315,15 +390,21 @@ impl ParameterizedDecode<VdafPrepState> for VdafPrepShare {
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
 #[serde(rename_all = "snake_case")]
 pub enum VdafAggregateShare {
-    Field32(prio::vdaf::AggregateShare<FieldPrio2>),
-    Field64(prio::vdaf::AggregateShare<Field64>),
-    Field128(prio::vdaf::AggregateShare<Field128>),
+    Field32Draft09(AggregateShareDraft09<FieldPrio2Draft09>),
+    Field64Draft09(AggregateShareDraft09<Field64Draft09>),
+    Field128Draft09(AggregateShareDraft09<Field128Draft09>),
+    Field32(AggregateShare<FieldPrio2>),
+    Field64(AggregateShare<Field64>),
+    Field128(AggregateShare<Field128>),
 }
 
 #[cfg(any(test, feature = "test-utils"))]
 impl deepsize::DeepSizeOf for VdafAggregateShare {
     fn deep_size_of_children(&self, _context: &mut deepsize::Context) -> usize {
         match self {
+            VdafAggregateShare::Field32Draft09(s) => std::mem::size_of_val(s.as_ref()),
+            VdafAggregateShare::Field64Draft09(s) => std::mem::size_of_val(s.as_ref()),
+            VdafAggregateShare::Field128Draft09(s) => std::mem::size_of_val(s.as_ref()),
             VdafAggregateShare::Field32(s) => std::mem::size_of_val(s.as_ref()),
             VdafAggregateShare::Field64(s) => std::mem::size_of_val(s.as_ref()),
             VdafAggregateShare::Field128(s) => std::mem::size_of_val(s.as_ref()),
@@ -334,6 +415,15 @@ impl deepsize::DeepSizeOf for VdafAggregateShare {
 impl Encode for VdafAggregateShare {
     fn encode(&self, bytes: &mut Vec<u8>) -> Result<(), CodecError> {
         match self {
+            VdafAggregateShare::Field32Draft09(agg_share) => {
+                agg_share.encode(bytes).map_err(from_codec_error)
+            }
+            VdafAggregateShare::Field64Draft09(agg_share) => {
+                agg_share.encode(bytes).map_err(from_codec_error)
+            }
+            VdafAggregateShare::Field128Draft09(agg_share) => {
+                agg_share.encode(bytes).map_err(from_codec_error)
+            }
             VdafAggregateShare::Field32(agg_share) => agg_share.encode(bytes),
             VdafAggregateShare::Field64(agg_share) => agg_share.encode(bytes),
             VdafAggregateShare::Field128(agg_share) => agg_share.encode(bytes),
@@ -344,8 +434,12 @@ impl Encode for VdafAggregateShare {
 impl VdafConfig {
     pub(crate) fn uninitialized_verify_key(&self) -> VdafVerifyKey {
         match self {
-            Self::Prio3(Prio3Config::SumVecField64MultiproofHmacSha256Aes128 { .. })
+            Self::Prio3Draft09(Prio3Config::SumVecField64MultiproofHmacSha256Aes128 { .. })
             | Self::Prio2 { .. } => VdafVerifyKey::L32([0; 32]),
+            Self::Prio3Draft09(..) => VdafVerifyKey::L16([0; 16]),
+            Self::Prio3(Prio3Config::SumVecField64MultiproofHmacSha256Aes128 { .. }) => {
+                VdafVerifyKey::L32([0; 32])
+            }
             Self::Prio3(..) => VdafVerifyKey::L16([0; 16]),
             #[cfg(feature = "experimental")]
             Self::Mastic { .. } => VdafVerifyKey::L16([0; 16]),
@@ -356,9 +450,16 @@ impl VdafConfig {
     /// Parse a verification key from raw bytes.
     pub fn get_decoded_verify_key(&self, bytes: &[u8]) -> Result<VdafVerifyKey, CodecError> {
         match self {
-            Self::Prio3(Prio3Config::SumVecField64MultiproofHmacSha256Aes128 { .. })
+            Self::Prio3Draft09(Prio3Config::SumVecField64MultiproofHmacSha256Aes128 { .. })
             | Self::Prio2 { .. } => Ok(VdafVerifyKey::L32(
-                <[u8; 32]>::try_from(bytes).map_err(|e| CodecError::Other(Box::new(e)))?,
+                <[u8; 32]>::try_from(bytes)
+                    .map_err(|e| CodecErrorDraft09::Other(Box::new(e)))
+                    .map_err(from_codec_error)?,
+            )),
+            Self::Prio3Draft09(..) => Ok(VdafVerifyKey::L16(
+                <[u8; 16]>::try_from(bytes)
+                    .map_err(|e| CodecErrorDraft09::Other(Box::new(e)))
+                    .map_err(from_codec_error)?,
             )),
             Self::Prio3(..) => Ok(VdafVerifyKey::L16(
                 <[u8; 16]>::try_from(bytes).map_err(|e| CodecError::Other(Box::new(e)))?,
@@ -368,7 +469,9 @@ impl VdafConfig {
                 <[u8; 16]>::try_from(bytes).map_err(|e| CodecError::Other(Box::new(e)))?,
             )),
             Self::Pine(..) => Ok(VdafVerifyKey::L32(
-                <[u8; 32]>::try_from(bytes).map_err(|e| CodecError::Other(Box::new(e)))?,
+                <[u8; 32]>::try_from(bytes)
+                    .map_err(|e| CodecErrorDraft09::Other(Box::new(e)))
+                    .map_err(from_codec_error)?,
             )),
         }
     }
@@ -385,7 +488,7 @@ impl VdafConfig {
     /// executed.
     pub fn is_valid_agg_param(&self, agg_param: &[u8]) -> bool {
         match self {
-            Self::Prio3(..) | Self::Prio2 { .. } => agg_param.is_empty(),
+            Self::Prio3Draft09(..) | Self::Prio3(..) | Self::Prio2 { .. } => agg_param.is_empty(),
             #[cfg(feature = "experimental")]
             Self::Mastic { .. } => true,
             Self::Pine(..) => agg_param.is_empty(),
@@ -411,10 +514,14 @@ pub(crate) fn decode_field_vec<F: FieldElement>(
 
 fn shard_then_encode<V: Vdaf + Client<16>>(
     vdaf: &V,
+    task_id: TaskId,
     measurement: &V::Measurement,
     nonce: &[u8; 16],
 ) -> Result<(Vec<u8>, [Vec<u8>; 2]), VdafError> {
-    let (public_share, input_shares) = vdaf.shard(measurement, nonce)?;
+    let mut ctx = [0; CTX_STRING_PREFIX.len() + 32];
+    ctx[..CTX_STRING_PREFIX.len()].copy_from_slice(CTX_STRING_PREFIX);
+    ctx[CTX_STRING_PREFIX.len()..].copy_from_slice(&task_id.0);
+    let (public_share, input_shares) = vdaf.shard(&ctx, measurement, nonce)?;
 
     Ok((
         public_share.get_encoded()?,
@@ -433,6 +540,7 @@ fn shard_then_encode<V: Vdaf + Client<16>>(
 
 fn prep_finish_from_shares<V, const VERIFY_KEY_SIZE: usize, const NONCE_SIZE: usize>(
     vdaf: &V,
+    task_id: TaskId,
     agg_id: usize,
     host_state: V::PrepareState,
     host_share: V::PrepareShare,
@@ -444,8 +552,13 @@ where
     // Decode the Helper's inbound message.
     let peer_share = V::PrepareShare::get_decoded_with_param(&host_state, peer_share_data)?;
 
+    let mut ctx = [0; CTX_STRING_PREFIX.len() + 32];
+    ctx[..CTX_STRING_PREFIX.len()].copy_from_slice(CTX_STRING_PREFIX);
+    ctx[CTX_STRING_PREFIX.len()..].copy_from_slice(&task_id.0);
+
     // Preprocess the inbound messages.
     let message = vdaf.prepare_shares_to_prepare_message(
+        &ctx,
         &(),
         if agg_id == 0 {
             [host_share, peer_share]
@@ -456,7 +569,7 @@ where
     let message_data = message.get_encoded()?;
 
     // Compute the host's output share.
-    match vdaf.prepare_next(host_state, message)? {
+    match vdaf.prepare_next(&ctx, host_state, message)? {
         PrepareTransition::Continue(..) => Err(VdafError::Dap(fatal_error!(
             err = format!("prep_finish_from_shares: unexpected transition")
         ))),
@@ -466,6 +579,7 @@ where
 
 fn prep_finish<V, const VERIFY_KEY_SIZE: usize, const NONCE_SIZE: usize>(
     vdaf: &V,
+    task_id: TaskId,
     host_state: V::PrepareState,
     peer_message_data: &[u8],
 ) -> Result<V::OutputShare, VdafError>
@@ -475,8 +589,12 @@ where
     // Decode the inbound message from the peer, which contains the preprocessed prepare message.
     let peer_message = V::PrepareMessage::get_decoded_with_param(&host_state, peer_message_data)?;
 
+    let mut ctx = [0; CTX_STRING_PREFIX.len() + 32];
+    ctx[..CTX_STRING_PREFIX.len()].copy_from_slice(CTX_STRING_PREFIX);
+    ctx[CTX_STRING_PREFIX.len()..].copy_from_slice(&task_id.0);
     // Compute the host's output share.
-    match vdaf.prepare_next(host_state, peer_message)? {
+
+    match vdaf.prepare_next(&ctx, host_state, peer_message)? {
         PrepareTransition::Continue(..) => Err(VdafError::Dap(fatal_error!(
             err = format!("prep_finish: unexpected transition"),
         ))),
@@ -500,3 +618,95 @@ where
     }
     Ok(vdaf.unshard(&(), agg_shares_vec, num_measurements)?)
 }
+
+fn shard_then_encode_draft09<V: VdafDraft09 + ClientDraft09<16>>(
+    vdaf: &V,
+    measurement: &V::Measurement,
+    nonce: &[u8; 16],
+) -> Result<(Vec<u8>, [Vec<u8>; 2]), VdafError> {
+    let (public_share, input_shares) = vdaf.shard(measurement, nonce)?;
+
+    Ok((
+        public_share.get_encoded()?,
+        input_shares
+            .iter()
+            .map(|input_share| input_share.get_encoded())
+            .collect::<Result<Vec<_>, _>>()?
+            .try_into()
+            .map_err(|e: Vec<_>| {
+                VdafError::Dap(fatal_error!(
+                    err = format!("expected 2 input shares got {}", e.len())
+                ))
+            })?,
+    ))
+}
+
+fn prep_finish_from_shares_draft09<V, const VERIFY_KEY_SIZE: usize, const NONCE_SIZE: usize>(
+    vdaf: &V,
+    agg_id: usize,
+    host_state: V::PrepareState,
+    host_share: V::PrepareShare,
+    peer_share_data: &[u8],
+) -> Result<(V::OutputShare, Vec<u8>), VdafError>
+where
+    V: VdafDraft09<AggregationParam = ()> + AggregatorDraft09<VERIFY_KEY_SIZE, NONCE_SIZE>,
+{
+    // Decode the Helper's inbound message.
+    let peer_share = V::PrepareShare::get_decoded_with_param(&host_state, peer_share_data)?;
+
+    // Preprocess the inbound messages.
+    let message = vdaf.prepare_shares_to_prepare_message(
+        &(),
+        if agg_id == 0 {
+            [host_share, peer_share]
+        } else {
+            [peer_share, host_share]
+        },
+    )?;
+    let message_data = message.get_encoded()?;
+
+    // Compute the host's output share.
+    match vdaf.prepare_next(host_state, message)? {
+        PrepareTransitionDraft09::Continue(..) => Err(VdafError::Dap(fatal_error!(
+            err = format!("prep_finish_from_shares: unexpected transition")
+        ))),
+        PrepareTransitionDraft09::Finish(out_share) => Ok((out_share, message_data)),
+    }
+}
+
+fn prep_finish_draft09<V, const VERIFY_KEY_SIZE: usize, const NONCE_SIZE: usize>(
+    vdaf: &V,
+    host_state: V::PrepareState,
+    peer_message_data: &[u8],
+) -> Result<V::OutputShare, VdafError>
+where
+    V: VdafDraft09 + AggregatorDraft09<VERIFY_KEY_SIZE, NONCE_SIZE>,
+{
+    // Decode the inbound message from the peer, which contains the preprocessed prepare message.
+    let peer_message = V::PrepareMessage::get_decoded_with_param(&host_state, peer_message_data)?;
+
+    // Compute the host's output share.
+    match vdaf.prepare_next(host_state, peer_message)? {
+        PrepareTransitionDraft09::Continue(..) => Err(VdafError::Dap(fatal_error!(
+            err = format!("prep_finish: unexpected transition"),
+        ))),
+        PrepareTransitionDraft09::Finish(out_share) => Ok(out_share),
+    }
+}
+
+fn unshard_draft09<V, M>(
+    vdaf: &V,
+    num_measurements: usize,
+    agg_shares: M,
+) -> Result<V::AggregateResult, VdafError>
+where
+    V: VdafDraft09<AggregationParam = ()> + CollectorDraft09,
+    M: IntoIterator<Item = Vec<u8>>,
+{
+    let mut agg_shares_vec = Vec::with_capacity(vdaf.num_aggregators());
+    for data in agg_shares {
+        let agg_share = V::AggregateShare::get_decoded_with_param(&(vdaf, &()), data.as_ref())?;
+        agg_shares_vec.push(agg_share);
+    }
+    Ok(vdaf.unshard(&(), agg_shares_vec, num_measurements)?)
+}
diff --git a/crates/daphne/src/vdaf/pine.rs b/crates/daphne/src/vdaf/pine.rs
index 903c83b..9230f3a 100644
--- a/crates/daphne/src/vdaf/pine.rs
+++ b/crates/daphne/src/vdaf/pine.rs
@@ -7,19 +7,19 @@ use crate::{
         VDAF_TYPE_PINE_FIELD32_HMAC_SHA256_AES128, VDAF_TYPE_PINE_FIELD64_HMAC_SHA256_AES128,
     },
     pine::{msg, vdaf::PinePrepState, Pine, PineParam},
-    vdaf::{prep_finish, prep_finish_from_shares, unshard},
     DapAggregateResult, DapMeasurement,
 };
 
 use super::{
-    shard_then_encode, VdafAggregateShare, VdafError, VdafPrepShare, VdafPrepState, VdafVerifyKey,
+    prep_finish_draft09, prep_finish_from_shares_draft09, shard_then_encode_draft09,
+    unshard_draft09, VdafAggregateShare, VdafError, VdafPrepShare, VdafPrepState, VdafVerifyKey,
 };
-use prio::{
+use prio_draft09::{
     codec::ParameterizedDecode,
     field::{FftFriendlyFieldElement, Field64, FieldPrio2},
     vdaf::{
         xof::{Xof, XofHmacSha256Aes128},
-        Aggregator,
+        AggregateShare, Aggregator, OutputShare,
     },
 };
 use serde::{Deserialize, Serialize};
@@ -71,11 +71,11 @@ impl PineConfig {
         match self {
             PineConfig::Field32HmacSha256Aes128 { param } => {
                 let vdaf = pine32_hmac_sha256_aes128(param)?;
-                shard_then_encode(&vdaf, gradient, nonce)
+                shard_then_encode_draft09(&vdaf, gradient, nonce)
             }
             PineConfig::Field64HmacSha256Aes128 { param } => {
                 let vdaf = pine64_hmac_sha256_aes128(param)?;
-                shard_then_encode(&vdaf, gradient, nonce)
+                shard_then_encode_draft09(&vdaf, gradient, nonce)
             }
         }
     }
@@ -140,9 +140,9 @@ impl PineConfig {
             ) => {
                 let vdaf = pine32_hmac_sha256_aes128(param)?;
                 let (out_share, outbound) =
-                    prep_finish_from_shares(&vdaf, agg_id, state, share, peer_share_data)?;
-                let agg_share = VdafAggregateShare::Field32(prio::vdaf::AggregateShare::from(
-                    prio::vdaf::OutputShare::from(out_share.0),
+                    prep_finish_from_shares_draft09(&vdaf, agg_id, state, share, peer_share_data)?;
+                let agg_share = VdafAggregateShare::Field32Draft09(AggregateShare::from(
+                    OutputShare::from(out_share.0),
                 ));
                 Ok((agg_share, outbound))
             }
@@ -153,9 +153,9 @@ impl PineConfig {
             ) => {
                 let vdaf = pine64_hmac_sha256_aes128(param)?;
                 let (out_share, outbound) =
-                    prep_finish_from_shares(&vdaf, agg_id, state, share, peer_share_data)?;
-                let agg_share = VdafAggregateShare::Field64(prio::vdaf::AggregateShare::from(
-                    prio::vdaf::OutputShare::from(out_share.0),
+                    prep_finish_from_shares_draft09(&vdaf, agg_id, state, share, peer_share_data)?;
+                let agg_share = VdafAggregateShare::Field64Draft09(AggregateShare::from(
+                    OutputShare::from(out_share.0),
                 ));
                 Ok((agg_share, outbound))
             }
@@ -176,9 +176,9 @@ impl PineConfig {
                 VdafPrepState::Pine32HmacSha256Aes128(state),
             ) => {
                 let vdaf = pine32_hmac_sha256_aes128(param)?;
-                let out_share = prep_finish(&vdaf, state, peer_message_data)?;
-                let agg_share = VdafAggregateShare::Field32(prio::vdaf::AggregateShare::from(
-                    prio::vdaf::OutputShare::from(out_share.0),
+                let out_share = prep_finish_draft09(&vdaf, state, peer_message_data)?;
+                let agg_share = VdafAggregateShare::Field32Draft09(AggregateShare::from(
+                    OutputShare::from(out_share.0),
                 ));
                 Ok(agg_share)
             }
@@ -187,9 +187,9 @@ impl PineConfig {
                 VdafPrepState::Pine64HmacSha256Aes128(state),
             ) => {
                 let vdaf = pine64_hmac_sha256_aes128(param)?;
-                let out_share = prep_finish(&vdaf, state, peer_message_data)?;
-                let agg_share = VdafAggregateShare::Field64(prio::vdaf::AggregateShare::from(
-                    prio::vdaf::OutputShare::from(out_share.0),
+                let out_share = prep_finish_draft09(&vdaf, state, peer_message_data)?;
+                let agg_share = VdafAggregateShare::Field64Draft09(AggregateShare::from(
+                    OutputShare::from(out_share.0),
                 ));
                 Ok(agg_share)
             }
@@ -207,12 +207,12 @@ impl PineConfig {
         match self {
             PineConfig::Field32HmacSha256Aes128 { param } => {
                 let vdaf = pine32_hmac_sha256_aes128(param)?;
-                let agg_res = unshard(&vdaf, num_measurements, agg_shares)?;
+                let agg_res = unshard_draft09(&vdaf, num_measurements, agg_shares)?;
                 Ok(DapAggregateResult::F64Vec(agg_res))
             }
             PineConfig::Field64HmacSha256Aes128 { param } => {
                 let vdaf = pine64_hmac_sha256_aes128(param)?;
-                let agg_res = unshard(&vdaf, num_measurements, agg_shares)?;
+                let agg_res = unshard_draft09(&vdaf, num_measurements, agg_shares)?;
                 Ok(DapAggregateResult::F64Vec(agg_res))
             }
         }
diff --git a/crates/daphne/src/vdaf/prio2.rs b/crates/daphne/src/vdaf/prio2.rs
index bc787b9..4eb873a 100644
--- a/crates/daphne/src/vdaf/prio2.rs
+++ b/crates/daphne/src/vdaf/prio2.rs
@@ -8,7 +8,7 @@ use crate::{
     fatal_error, vdaf::VdafError, DapAggregateResult, DapMeasurement, VdafAggregateShare,
     VdafPrepShare, VdafPrepState, VdafVerifyKey,
 };
-use prio::{
+use prio_draft09::{
     codec::{Decode, Encode, ParameterizedDecode},
     field::FieldPrio2,
     vdaf::{
@@ -104,7 +104,7 @@ pub(crate) fn prio2_prep_finish_from_shares(
             )))
         }
     };
-    let agg_share = VdafAggregateShare::Field32(vdaf.aggregate(&(), [out_share])?);
+    let agg_share = VdafAggregateShare::Field32Draft09(vdaf.aggregate(&(), [out_share])?);
     Ok((agg_share, outbound))
 }
 
@@ -133,7 +133,7 @@ pub(crate) fn prio2_prep_finish(
             )))
         }
     };
-    let agg_share = VdafAggregateShare::Field32(vdaf.aggregate(&(), [out_share])?);
+    let agg_share = VdafAggregateShare::Field32Draft09(vdaf.aggregate(&(), [out_share])?);
     Ok(agg_share)
 }
 
diff --git a/crates/daphne/src/vdaf/prio3.rs b/crates/daphne/src/vdaf/prio3.rs
index 03efe92..dafc76a 100644
--- a/crates/daphne/src/vdaf/prio3.rs
+++ b/crates/daphne/src/vdaf/prio3.rs
@@ -1,61 +1,36 @@
-// Copyright (c) 2022 Cloudflare, Inc. All rights reserved.
+// Copyright (c) 2024 Cloudflare, Inc. All rights reserved.
 // SPDX-License-Identifier: BSD-3-Clause
 
-//! Parameters for the [Prio3 VDAF](https://datatracker.ietf.org/doc/draft-patton-cfrg-vdaf/).
+//! Parameters for the [Prio3 VDAF](https://datatracker.ietf.org/doc/draft-irtf-cfrg-vdaf/13/).
 
 use crate::{
     fatal_error,
-    messages::taskprov::VDAF_TYPE_PRIO3_SUM_VEC_FIELD64_MULTIPROOF_HMAC_SHA256_AES128,
+    messages::TaskId,
     vdaf::{VdafError, VdafVerifyKey},
     DapAggregateResult, DapMeasurement, Prio3Config, VdafAggregateShare, VdafPrepShare,
     VdafPrepState,
 };
+
+use super::{prep_finish, prep_finish_from_shares, shard_then_encode, unshard};
+
 use prio::{
     codec::ParameterizedDecode,
-    field::Field64,
-    flp::{
-        gadgets::{Mul, ParallelSum},
-        types::SumVec,
-    },
+    flp::Type,
     vdaf::{
         prio3::{Prio3, Prio3InputShare, Prio3PrepareShare, Prio3PrepareState, Prio3PublicShare},
-        xof::XofHmacSha256Aes128,
+        xof::Xof,
         Aggregator,
     },
 };
 
-use super::{prep_finish, prep_finish_from_shares, shard_then_encode, unshard};
-
-const ERR_FIELD_TYPE: &str = "unexpected field type for step or message";
-
-type Prio3SumVecField64MultiproofHmacSha256Aes128 =
-    Prio3<SumVec<Field64, ParallelSum<Field64, Mul<Field64>>>, XofHmacSha256Aes128, 32>;
-
-fn new_prio3_sum_vec_field64_multiproof_hmac_sha256_aes128(
-    bits: usize,
-    length: usize,
-    chunk_length: usize,
-    num_proofs: u8,
-) -> Result<Prio3SumVecField64MultiproofHmacSha256Aes128, VdafError> {
-    Prio3::new(
-        2,
-        num_proofs,
-        VDAF_TYPE_PRIO3_SUM_VEC_FIELD64_MULTIPROOF_HMAC_SHA256_AES128,
-        SumVec::new(bits, length, chunk_length).map_err(|e| {
-            VdafError::Dap(fatal_error!(
-                err = ?e,
-                "failed to create sum vec from bits({bits}), length({length}), chunk_length({chunk_length})"
-            ))
-        })?,
-    )
-    .map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3")))
-}
+const CTX_STRING_PREFIX: &[u8] = b"dap-13";
 
 /// Split the given measurement into a sequence of encoded input shares.
 pub(crate) fn prio3_shard(
     config: &Prio3Config,
     measurement: DapMeasurement,
     nonce: &[u8; 16],
+    task_id: TaskId,
 ) -> Result<(Vec<u8>, [Vec<u8>; 2]), VdafError> {
     match (config, measurement) {
         (Prio3Config::Count, DapMeasurement::U64(measurement)) => {
@@ -74,7 +49,7 @@ pub(crate) fn prio3_shard(
                     )))
                 }
             };
-            shard_then_encode(&vdaf, &measurement, nonce)
+            shard_then_encode(&vdaf, task_id, &measurement, nonce)
         }
         (
             Prio3Config::Histogram {
@@ -86,12 +61,10 @@ pub(crate) fn prio3_shard(
             let vdaf = Prio3::new_histogram(2, *length, *chunk_length)
                 .map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3 Histogram from num_aggregators(2), length({length}), chunk_length({chunk_length})")))?;
             let m: usize = measurement.try_into().unwrap();
-            shard_then_encode(&vdaf, &m, nonce)
+            shard_then_encode(&vdaf, task_id, &m, nonce)
         }
-        (Prio3Config::Sum { bits }, DapMeasurement::U64(measurement)) => {
-            let vdaf =
-                Prio3::new_sum(2, *bits).map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3 sum from num_aggregators(2), bits({bits})")))?;
-            shard_then_encode(&vdaf, &u128::from(measurement), nonce)
+        (Prio3Config::Sum { .. }, DapMeasurement::U64(_)) => {
+            Err(VdafError::Dap(fatal_error!(err = "Sum unimplemented")))
         }
         (
             Prio3Config::SumVec {
@@ -103,25 +76,16 @@ pub(crate) fn prio3_shard(
         ) => {
             let vdaf = Prio3::new_sum_vec(2, *bits, *length, *chunk_length)
                 .map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3 sum vec from num_aggregators(2), bits({bits}), length({length}), chunk_length({chunk_length})")))?;
-            shard_then_encode(&vdaf, &measurement, nonce)
+            shard_then_encode(&vdaf, task_id, &measurement, nonce)
         }
         (
-            Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
-                bits,
-                length,
-                chunk_length,
-                num_proofs,
-            },
-            DapMeasurement::U64Vec(measurement),
-        ) => {
-            let vdaf = new_prio3_sum_vec_field64_multiproof_hmac_sha256_aes128(
-                *bits,
-                *length,
-                *chunk_length,
-                *num_proofs,
-            )?;
-            shard_then_encode(&vdaf, &measurement, nonce)
-        }
+            Prio3Config::SumVecField64MultiproofHmacSha256Aes128 { .. },
+            DapMeasurement::U64Vec(_),
+        ) => Err(VdafError::Dap(fatal_error!(
+            err = format!(
+                "prio3_shard: SumVecField64MultiproofHmacSha256Aes128 is not defined for VDAF-13"
+            )
+        ))),
         _ => Err(VdafError::Dap(fatal_error!(
             err = format!("prio3_shard: unexpected VDAF config {config:?}")
         ))),
@@ -132,6 +96,7 @@ pub(crate) fn prio3_shard(
 pub(crate) fn prio3_prep_init(
     config: &Prio3Config,
     verify_key: &VdafVerifyKey,
+    task_id: TaskId,
     agg_id: usize,
     nonce: &[u8; 16],
     public_share_data: &[u8],
@@ -146,6 +111,7 @@ pub(crate) fn prio3_prep_init(
             })?;
             let (state, share) = prep_init(
                 vdaf,
+                task_id,
                 verify_key,
                 agg_id,
                 nonce,
@@ -168,6 +134,7 @@ pub(crate) fn prio3_prep_init(
                 .map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3 histogram from num_aggregators(2), length({length}), chunk_length({chunk_length})")))?;
             let (state, share) = prep_init(
                 vdaf,
+                task_id,
                 verify_key,
                 agg_id,
                 nonce,
@@ -179,21 +146,8 @@ pub(crate) fn prio3_prep_init(
                 VdafPrepShare::Prio3Field128(share),
             ))
         }
-        (Prio3Config::Sum { bits }, VdafVerifyKey::L16(verify_key)) => {
-            let vdaf =
-                Prio3::new_sum(2, *bits).map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3 sum from num_aggregators(2), bits({bits})")))?;
-            let (state, share) = prep_init(
-                vdaf,
-                verify_key,
-                agg_id,
-                nonce,
-                public_share_data,
-                input_share_data,
-            )?;
-            Ok((
-                VdafPrepState::Prio3Field128(state),
-                VdafPrepShare::Prio3Field128(share),
-            ))
+        (Prio3Config::Sum { .. }, VdafVerifyKey::L16(_)) => {
+            Err(VdafError::Dap(fatal_error!(err = "sum unimplemented")))
         }
         (
             Prio3Config::SumVec {
@@ -207,6 +161,7 @@ pub(crate) fn prio3_prep_init(
                 .map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3 sum vec from num_aggregators(2), bits({bits}), length({length}), chunk_length({chunk_length})")))?;
             let (state, share) = prep_init(
                 vdaf,
+                task_id,
                 verify_key,
                 agg_id,
                 nonce,
@@ -220,46 +175,27 @@ pub(crate) fn prio3_prep_init(
         }
         (
             Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
-                bits,
-                length,
-                chunk_length,
-                num_proofs,
-            },
-            VdafVerifyKey::L32(verify_key),
+            ..},
+            VdafVerifyKey::L32(_),
         ) => {
-            let vdaf = new_prio3_sum_vec_field64_multiproof_hmac_sha256_aes128(
-                *bits,
-                *length,
-                *chunk_length,
-                *num_proofs,
-            )?;
-            let (state, share) = prep_init(
-                vdaf,
-                verify_key,
-                agg_id,
-                nonce,
-                public_share_data,
-                input_share_data,
-            )?;
-            Ok((
-                VdafPrepState::Prio3Field64HmacSha256Aes128(state),
-                VdafPrepShare::Prio3Field64HmacSha256Aes128(share),
-            ))
-        }
+            Err(VdafError::Dap(fatal_error!(err = format!("prio3_shard: SumVecField64MultiproofHmacSha256Aes128 is not defined for VDAF-13"))))
+        },
         _ => {
             return Err(VdafError::Dap(fatal_error!(
                 err = "unhandled config and verify key combination",
             )))
         }
+
     };
 
     type Prio3Prepared<T, const SEED_SIZE: usize> = (
-        Prio3PrepareState<<T as prio::flp::Type>::Field, SEED_SIZE>,
-        Prio3PrepareShare<<T as prio::flp::Type>::Field, SEED_SIZE>,
+        Prio3PrepareState<<T as Type>::Field, SEED_SIZE>,
+        Prio3PrepareShare<<T as Type>::Field, SEED_SIZE>,
     );
 
     fn prep_init<T, P, const SEED_SIZE: usize>(
         vdaf: Prio3<T, P, SEED_SIZE>,
+        task_id: TaskId,
         verify_key: &[u8; SEED_SIZE],
         agg_id: usize,
         nonce: &[u8; 16],
@@ -267,8 +203,8 @@ pub(crate) fn prio3_prep_init(
         input_share_data: &[u8],
     ) -> Result<Prio3Prepared<T, SEED_SIZE>, VdafError>
     where
-        T: prio::flp::Type,
-        P: prio::vdaf::xof::Xof<SEED_SIZE>,
+        T: Type,
+        P: Xof<SEED_SIZE>,
     {
         // Parse the public share.
         let public_share = Prio3PublicShare::get_decoded_with_param(&vdaf, public_share_data)?;
@@ -277,8 +213,19 @@ pub(crate) fn prio3_prep_init(
         let input_share =
             Prio3InputShare::get_decoded_with_param(&(&vdaf, agg_id), input_share_data)?;
 
+        let mut ctx = [0; CTX_STRING_PREFIX.len() + 32];
+        ctx[..CTX_STRING_PREFIX.len()].copy_from_slice(CTX_STRING_PREFIX);
+        ctx[CTX_STRING_PREFIX.len()..].copy_from_slice(&task_id.0);
         // Run the prepare-init algorithm, returning the initial state.
-        Ok(vdaf.prepare_init(verify_key, agg_id, &(), nonce, &public_share, &input_share)?)
+        Ok(vdaf.prepare_init(
+            verify_key,
+            &ctx,
+            agg_id,
+            &(),
+            nonce,
+            &public_share,
+            &input_share,
+        )?)
     }
 }
 
@@ -286,6 +233,7 @@ pub(crate) fn prio3_prep_init(
 pub(crate) fn prio3_prep_finish_from_shares(
     config: &Prio3Config,
     agg_id: usize,
+    task_id: TaskId,
     host_state: VdafPrepState,
     host_share: VdafPrepShare,
     peer_share_data: &[u8],
@@ -302,7 +250,7 @@ pub(crate) fn prio3_prep_finish_from_shares(
                 )
             })?;
             let (out_share, outbound) =
-                prep_finish_from_shares(&vdaf, agg_id, state, share, peer_share_data)?;
+                prep_finish_from_shares(&vdaf, task_id, agg_id, state, share, peer_share_data)?;
             let agg_share = VdafAggregateShare::Field64(vdaf.aggregate(&(), [out_share])?);
             (agg_share, outbound)
         }
@@ -317,22 +265,15 @@ pub(crate) fn prio3_prep_finish_from_shares(
             let vdaf = Prio3::new_histogram(2, *length, *chunk_length)
                 .map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3 histogram from num_aggregators(2), length({length}), chunk_length({chunk_length})")))?;
             let (out_share, outbound) =
-                prep_finish_from_shares(&vdaf, agg_id, state, share, peer_share_data)?;
+                prep_finish_from_shares(&vdaf, task_id, agg_id, state, share, peer_share_data)?;
             let agg_share = VdafAggregateShare::Field128(vdaf.aggregate(&(), [out_share])?);
             (agg_share, outbound)
         }
         (
-            Prio3Config::Sum { bits },
-            VdafPrepState::Prio3Field128(state),
-            VdafPrepShare::Prio3Field128(share),
-        ) => {
-            let vdaf =
-                Prio3::new_sum(2, *bits).map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3 sum from num_aggregators(2), bits({bits})")))?;
-            let (out_share, outbound) =
-                prep_finish_from_shares(&vdaf, agg_id, state, share, peer_share_data)?;
-            let agg_share = VdafAggregateShare::Field128(vdaf.aggregate(&(), [out_share])?);
-            (agg_share, outbound)
-        }
+            Prio3Config::Sum { .. },
+            VdafPrepState::Prio3Field128(_),
+            VdafPrepShare::Prio3Field128(_),
+        ) => Err(VdafError::Dap(fatal_error!(err = "Prio3Sum is not supported in VDAF-13")))?,
         (
             Prio3Config::SumVec {
                 bits,
@@ -345,34 +286,22 @@ pub(crate) fn prio3_prep_finish_from_shares(
             let vdaf = Prio3::new_sum_vec(2, *bits, *length, *chunk_length)
                 .map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3 sum vec from num_aggregators(2), bits({bits}), length({length}), chunk_length({chunk_length})")))?;
             let (out_share, outbound) =
-                prep_finish_from_shares(&vdaf, agg_id, state, share, peer_share_data)?;
+                prep_finish_from_shares(&vdaf, task_id, agg_id, state, share, peer_share_data)?;
             let agg_share = VdafAggregateShare::Field128(vdaf.aggregate(&(), [out_share])?);
             (agg_share, outbound)
         }
         (
             Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
-                bits,
-                length,
-                chunk_length,
-                num_proofs,
-            },
-            VdafPrepState::Prio3Field64HmacSha256Aes128(state),
-            VdafPrepShare::Prio3Field64HmacSha256Aes128(share),
+            ..
+        },
+            VdafPrepState::Prio3Field64HmacSha256Aes128(_),
+            VdafPrepShare::Prio3Field64HmacSha256Aes128(_),
         ) => {
-            let vdaf = new_prio3_sum_vec_field64_multiproof_hmac_sha256_aes128(
-                *bits,
-                *length,
-                *chunk_length,
-                *num_proofs,
-            )?;
-            let (out_share, outbound) =
-                prep_finish_from_shares(&vdaf, agg_id, state, share, peer_share_data)?;
-            let agg_share = VdafAggregateShare::Field64(vdaf.aggregate(&(), [out_share])?);
-            (agg_share, outbound)
+            return Err(VdafError::Dap(fatal_error!(err = format!("prio3_prep_finish_from_shares: SumVecField64MultiproofHmacSha256Aes128 is not defined for VDAF-13"))))
         }
         _ => {
             return Err(VdafError::Dap(fatal_error!(
-                err = format!("prio3_prep_finish_from_shares: {ERR_FIELD_TYPE}")
+                err = format!("prio3_prep_finish_from_shares: unexpected field type for step or message")
             )))
         }
     };
@@ -385,6 +314,7 @@ pub(crate) fn prio3_prep_finish(
     config: &Prio3Config,
     host_state: VdafPrepState,
     peer_message_data: &[u8],
+    task_id: TaskId,
 ) -> Result<VdafAggregateShare, VdafError> {
     let agg_share = match (&config, host_state) {
         (Prio3Config::Count, VdafPrepState::Prio3Field64(state)) => {
@@ -393,7 +323,7 @@ pub(crate) fn prio3_prep_finish(
                     fatal_error!(err = ?e, "failed to create prio3 count from num_aggregators(2)"),
                 )
             })?;
-            let out_share = prep_finish(&vdaf, state, peer_message_data)?;
+            let out_share = prep_finish(&vdaf, task_id, state, peer_message_data)?;
             VdafAggregateShare::Field64(vdaf.aggregate(&(), [out_share])?)
         }
         (
@@ -405,14 +335,11 @@ pub(crate) fn prio3_prep_finish(
         ) => {
             let vdaf = Prio3::new_histogram(2, *length, *chunk_length)
                 .map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3 histogram from num_aggregators(2), length({length}), chunk_length({chunk_length})")))?;
-            let out_share = prep_finish(&vdaf, state, peer_message_data)?;
+            let out_share = prep_finish(&vdaf, task_id, state, peer_message_data)?;
             VdafAggregateShare::Field128(vdaf.aggregate(&(), [out_share])?)
         }
-        (Prio3Config::Sum { bits }, VdafPrepState::Prio3Field128(state)) => {
-            let vdaf =
-                Prio3::new_sum(2, *bits).map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3 sum from num_aggregators(2), bits({bits})")))?;
-            let out_share = prep_finish(&vdaf, state, peer_message_data)?;
-            VdafAggregateShare::Field128(vdaf.aggregate(&(), [out_share])?)
+        (Prio3Config::Sum { .. }, VdafPrepState::Prio3Field128(_)) => {
+            Err(VdafError::Dap(fatal_error!(err = "sum unimplemented")))?
         }
         (
             Prio3Config::SumVec {
@@ -424,31 +351,22 @@ pub(crate) fn prio3_prep_finish(
         ) => {
             let vdaf = Prio3::new_sum_vec(2, *bits, *length, *chunk_length)
                 .map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3 sum vec from num_aggregators(2), bits({bits}), length({length}), chunk_length({chunk_length})")))?;
-            let out_share = prep_finish(&vdaf, state, peer_message_data)?;
+            let out_share = prep_finish(&vdaf, task_id, state, peer_message_data)?;
             VdafAggregateShare::Field128(vdaf.aggregate(&(), [out_share])?)
         }
         (
             Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
-                bits,
-                length,
-                chunk_length,
-                num_proofs,
+            ..
             },
-            VdafPrepState::Prio3Field64HmacSha256Aes128(state),
+            VdafPrepState::Prio3Field64HmacSha256Aes128(_),
         ) => {
-            let vdaf = new_prio3_sum_vec_field64_multiproof_hmac_sha256_aes128(
-                *bits,
-                *length,
-                *chunk_length,
-                *num_proofs,
-            )?;
-            let out_share = prep_finish(&vdaf, state, peer_message_data)?;
-            VdafAggregateShare::Field64(vdaf.aggregate(&(), [out_share])?)
+
+            return Err(VdafError::Dap(fatal_error!(err = format!("prio3_prep_finish: SumVecField64MultiproofHmacSha256Aes128 is not defined for VDAF-13"))))
         }
 
         _ => {
             return Err(VdafError::Dap(fatal_error!(
-                err = format!("prio3_prep_finish: {ERR_FIELD_TYPE}")
+                err = format!("prio3_prep_finish: unexpected field type for step or message")
             )))
         }
     };
@@ -481,12 +399,7 @@ pub(crate) fn prio3_unshard<M: IntoIterator<Item = Vec<u8>>>(
             let agg_res = unshard(&vdaf, num_measurements, agg_shares)?;
             Ok(DapAggregateResult::U128Vec(agg_res))
         }
-        Prio3Config::Sum { bits } => {
-            let vdaf =
-                Prio3::new_sum(2, *bits).map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3 sum from num_aggregators(2), bits({bits})")))?;
-            let agg_res = unshard(&vdaf, num_measurements, agg_shares)?;
-            Ok(DapAggregateResult::U128(agg_res))
-        }
+        Prio3Config::Sum { .. } => Err(VdafError::Dap(fatal_error!(err = "sum unimplemented"))),
         Prio3Config::SumVec {
             bits,
             length,
@@ -498,19 +411,9 @@ pub(crate) fn prio3_unshard<M: IntoIterator<Item = Vec<u8>>>(
             Ok(DapAggregateResult::U128Vec(agg_res))
         }
         Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
-            bits,
-            length,
-            chunk_length,
-            num_proofs,
+        ..
         } => {
-            let vdaf = new_prio3_sum_vec_field64_multiproof_hmac_sha256_aes128(
-                *bits,
-                *length,
-                *chunk_length,
-                *num_proofs,
-            )?;
-            let agg_res = unshard(&vdaf, num_measurements, agg_shares)?;
-            Ok(DapAggregateResult::U64Vec(agg_res))
+            Err(VdafError::Dap(fatal_error!(err = format!("prio3_prep_finish: SumVecField64MultiproofHmacSha256Aes128 is not defined for VDAF-13"))))
         }
     }
 }
@@ -518,15 +421,11 @@ pub(crate) fn prio3_unshard<M: IntoIterator<Item = Vec<u8>>>(
 #[cfg(test)]
 mod test {
 
-    use prio::vdaf::prio3_test::check_test_vec;
-
     use crate::{
         hpke::HpkeKemId,
         test_versions,
         testing::AggregationJobTest,
-        vdaf::{
-            prio3::new_prio3_sum_vec_field64_multiproof_hmac_sha256_aes128, Prio3Config, VdafConfig,
-        },
+        vdaf::{Prio3Config, VdafConfig},
         DapAggregateResult, DapAggregationParam, DapMeasurement, DapVersion,
     };
 
@@ -551,27 +450,6 @@ mod test {
 
     test_versions! { roundtrip_count }
 
-    fn roundtrip_sum(version: DapVersion) {
-        let mut t = AggregationJobTest::new(
-            &VdafConfig::Prio3(Prio3Config::Sum { bits: 23 }),
-            HpkeKemId::X25519HkdfSha256,
-            version,
-        );
-        let got = t.roundtrip(
-            DapAggregationParam::Empty,
-            vec![
-                DapMeasurement::U64(0),
-                DapMeasurement::U64(1),
-                DapMeasurement::U64(1337),
-                DapMeasurement::U64(4),
-                DapMeasurement::U64(0),
-            ],
-        );
-        assert_eq!(got, DapAggregateResult::U128(1342));
-    }
-
-    test_versions! { roundtrip_sum }
-
     fn roundtrip_sum_vec(version: DapVersion) {
         let mut t = AggregationJobTest::new(
             &VdafConfig::Prio3(Prio3Config::SumVec {
@@ -618,52 +496,4 @@ mod test {
     }
 
     test_versions! { roundtrip_histogram }
-
-    fn roundtrip_sum_vec_field64_multiproof_hmac_sha256_aes128(version: DapVersion) {
-        let mut t = AggregationJobTest::new(
-            &VdafConfig::Prio3(Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
-                bits: 23,
-                length: 2,
-                chunk_length: 1,
-                num_proofs: 4,
-            }),
-            HpkeKemId::X25519HkdfSha256,
-            version,
-        );
-        let got = t.roundtrip(
-            DapAggregationParam::Empty,
-            vec![
-                DapMeasurement::U64Vec(vec![1337, 0]),
-                DapMeasurement::U64Vec(vec![0, 1337]),
-                DapMeasurement::U64Vec(vec![1, 1]),
-            ],
-        );
-        assert_eq!(got, DapAggregateResult::U64Vec(vec![1338, 1338]));
-    }
-
-    test_versions! { roundtrip_sum_vec_field64_multiproof_hmac_sha256_aes128 }
-
-    #[test]
-    fn test_vec_sum_vec_field64_multiproof_hmac_sha256_aes128() {
-        for test_vec_json_str in [
-            include_str!("test_vec/Prio3SumVecField64MultiproofHmacSha256Aes128_0.json"),
-            include_str!("test_vec/Prio3SumVecField64MultiproofHmacSha256Aes128_1.json"),
-            include_str!("test_vec/Prio3SumVecField64MultiproofHmacSha256Aes128_2.json"),
-        ] {
-            check_test_vec(test_vec_json_str, |json_params, num_aggregators| {
-                assert_eq!(num_aggregators, 2);
-                new_prio3_sum_vec_field64_multiproof_hmac_sha256_aes128(
-                    json_params["bits"].as_u64().unwrap().try_into().unwrap(),
-                    json_params["length"].as_u64().unwrap().try_into().unwrap(),
-                    json_params["chunk_length"]
-                        .as_u64()
-                        .unwrap()
-                        .try_into()
-                        .unwrap(),
-                    json_params["proofs"].as_u64().unwrap().try_into().unwrap(),
-                )
-                .unwrap()
-            });
-        }
-    }
 }
diff --git a/crates/daphne/src/vdaf/prio3_draft09.rs b/crates/daphne/src/vdaf/prio3_draft09.rs
new file mode 100644
index 0000000..0dd5251
--- /dev/null
+++ b/crates/daphne/src/vdaf/prio3_draft09.rs
@@ -0,0 +1,675 @@
+// Copyright (c) 2022 Cloudflare, Inc. All rights reserved.
+// SPDX-License-Identifier: BSD-3-Clause
+
+//! Parameters for the [Prio3 VDAF](https://datatracker.ietf.org/doc/draft-irtf-cfrg-vdaf/09/).
+
+use crate::{
+    fatal_error,
+    messages::taskprov::VDAF_TYPE_PRIO3_SUM_VEC_FIELD64_MULTIPROOF_HMAC_SHA256_AES128,
+    vdaf::{VdafError, VdafVerifyKey},
+    DapAggregateResult, DapMeasurement, Prio3Config, VdafAggregateShare, VdafPrepShare,
+    VdafPrepState,
+};
+
+use super::{
+    prep_finish_draft09, prep_finish_from_shares_draft09, shard_then_encode_draft09,
+    unshard_draft09,
+};
+
+use prio_draft09::{
+    codec::ParameterizedDecode,
+    field::Field64,
+    flp::{
+        gadgets::{Mul, ParallelSum},
+        types::SumVec,
+        Type,
+    },
+    vdaf::{
+        prio3::{Prio3, Prio3InputShare, Prio3PrepareShare, Prio3PrepareState, Prio3PublicShare},
+        xof::{Xof, XofHmacSha256Aes128},
+        Aggregator,
+    },
+};
+
+const ERR_FIELD_TYPE: &str = "unexpected field type for step or message";
+
+type Prio3SumVecField64MultiproofHmacSha256Aes128 =
+    Prio3<SumVec<Field64, ParallelSum<Field64, Mul<Field64>>>, XofHmacSha256Aes128, 32>;
+
+fn new_prio3_sum_vec_field64_multiproof_hmac_sha256_aes128(
+    bits: usize,
+    length: usize,
+    chunk_length: usize,
+    num_proofs: u8,
+) -> Result<Prio3SumVecField64MultiproofHmacSha256Aes128, VdafError> {
+    Prio3::new(
+        2,
+        num_proofs,
+        VDAF_TYPE_PRIO3_SUM_VEC_FIELD64_MULTIPROOF_HMAC_SHA256_AES128,
+        SumVec::new(bits, length, chunk_length).map_err(|e| {
+            VdafError::Dap(fatal_error!(
+                err = ?e,
+                "failed to create sum vec from bits({bits}), length({length}), chunk_length({chunk_length})"
+            ))
+        })?,
+    )
+    .map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3")))
+}
+
+/// Split the given measurement into a sequence of encoded input shares.
+pub(crate) fn prio3_draft09_shard(
+    config: &Prio3Config,
+    measurement: DapMeasurement,
+    nonce: &[u8; 16],
+) -> Result<(Vec<u8>, [Vec<u8>; 2]), VdafError> {
+    match (config, measurement) {
+        (Prio3Config::Count, DapMeasurement::U64(measurement)) => {
+            let vdaf = Prio3::new_count(2).map_err(|e| {
+                VdafError::Dap(
+                    fatal_error!(err = ?e, "failed to create prio3 count from num_aggregators(2)"),
+                )
+            })?;
+            // TODO(cjpatton) Make this constant time.
+            let measurement = match measurement {
+                0 => false,
+                1 => true,
+                _ => {
+                    return Err(VdafError::Dap(fatal_error!(
+                        err = "cannot represent measurement as a 0 or 1"
+                    )))
+                }
+            };
+            shard_then_encode_draft09(&vdaf, &measurement, nonce)
+        }
+        (
+            Prio3Config::Histogram {
+                length,
+                chunk_length,
+            },
+            DapMeasurement::U64(measurement),
+        ) => {
+            let vdaf = Prio3::new_histogram(2, *length, *chunk_length)
+                .map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3 Histogram from num_aggregators(2), length({length}), chunk_length({chunk_length})")))?;
+            let m: usize = measurement.try_into().unwrap();
+            shard_then_encode_draft09(&vdaf, &m, nonce)
+        }
+        (Prio3Config::Sum { bits }, DapMeasurement::U64(measurement)) => {
+            let vdaf =
+                Prio3::new_sum(2, *bits).map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3 sum from num_aggregators(2), bits({bits})")))?;
+            shard_then_encode_draft09(&vdaf, &u128::from(measurement), nonce)
+        }
+        (
+            Prio3Config::SumVec {
+                bits,
+                length,
+                chunk_length,
+            },
+            DapMeasurement::U128Vec(measurement),
+        ) => {
+            let vdaf = Prio3::new_sum_vec(2, *bits, *length, *chunk_length)
+                .map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3 sum vec from num_aggregators(2), bits({bits}), length({length}), chunk_length({chunk_length})")))?;
+            shard_then_encode_draft09(&vdaf, &measurement, nonce)
+        }
+        (
+            Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
+                bits,
+                length,
+                chunk_length,
+                num_proofs,
+            },
+            DapMeasurement::U64Vec(measurement),
+        ) => {
+            let vdaf = new_prio3_sum_vec_field64_multiproof_hmac_sha256_aes128(
+                *bits,
+                *length,
+                *chunk_length,
+                *num_proofs,
+            )?;
+            shard_then_encode_draft09(&vdaf, &measurement, nonce)
+        }
+        _ => Err(VdafError::Dap(fatal_error!(
+            err = format!("prio3_shard: unexpected VDAF config {config:?}")
+        ))),
+    }
+}
+
+/// Consume an input share and return the corresponding VDAF step and message.
+pub(crate) fn prio3_draft09_prep_init(
+    config: &Prio3Config,
+    verify_key: &VdafVerifyKey,
+    agg_id: usize,
+    nonce: &[u8; 16],
+    public_share_data: &[u8],
+    input_share_data: &[u8],
+) -> Result<(VdafPrepState, VdafPrepShare), VdafError> {
+    return match (&config, verify_key) {
+        (Prio3Config::Count, VdafVerifyKey::L16(verify_key)) => {
+            let vdaf = Prio3::new_count(2).map_err(|e| {
+                VdafError::Dap(
+                    fatal_error!(err = ?e, "failed to create prio3 from num_aggregators(2)"),
+                )
+            })?;
+            let (state, share) = prep_init_draft09(
+                vdaf,
+                verify_key,
+                agg_id,
+                nonce,
+                public_share_data,
+                input_share_data,
+            )?;
+            Ok((
+                VdafPrepState::Prio3Draft09Field64(state),
+                VdafPrepShare::Prio3Draft09Field64(share),
+            ))
+        }
+        (
+            Prio3Config::Histogram {
+                length,
+                chunk_length,
+            },
+            VdafVerifyKey::L16(verify_key),
+        ) => {
+            let vdaf = Prio3::new_histogram(2, *length, *chunk_length)
+                .map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3 histogram from num_aggregators(2), length({length}), chunk_length({chunk_length})")))?;
+            let (state, share) = prep_init_draft09(
+                vdaf,
+                verify_key,
+                agg_id,
+                nonce,
+                public_share_data,
+                input_share_data,
+            )?;
+            Ok((
+                VdafPrepState::Prio3Draft09Field128(state),
+                VdafPrepShare::Prio3Draft09Field128(share),
+            ))
+        }
+        (Prio3Config::Sum { bits }, VdafVerifyKey::L16(verify_key)) => {
+            let vdaf =
+                Prio3::new_sum(2, *bits).map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3 sum from num_aggregators(2), bits({bits})")))?;
+            let (state, share) = prep_init_draft09(
+                vdaf,
+                verify_key,
+                agg_id,
+                nonce,
+                public_share_data,
+                input_share_data,
+            )?;
+            Ok((
+                VdafPrepState::Prio3Draft09Field128(state),
+                VdafPrepShare::Prio3Draft09Field128(share),
+            ))
+        }
+        (
+            Prio3Config::SumVec {
+                bits,
+                length,
+                chunk_length,
+            },
+            VdafVerifyKey::L16(verify_key),
+        ) => {
+            let vdaf = Prio3::new_sum_vec(2, *bits, *length, *chunk_length)
+                .map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3 sum vec from num_aggregators(2), bits({bits}), length({length}), chunk_length({chunk_length})")))?;
+            let (state, share) = prep_init_draft09(
+                vdaf,
+                verify_key,
+                agg_id,
+                nonce,
+                public_share_data,
+                input_share_data,
+            )?;
+            Ok((
+                VdafPrepState::Prio3Draft09Field128(state),
+                VdafPrepShare::Prio3Draft09Field128(share),
+            ))
+        }
+        (
+            Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
+                bits,
+                length,
+                chunk_length,
+                num_proofs,
+            },
+            VdafVerifyKey::L32(verify_key),
+        ) => {
+            let vdaf = new_prio3_sum_vec_field64_multiproof_hmac_sha256_aes128(
+                *bits,
+                *length,
+                *chunk_length,
+                *num_proofs,
+            )?;
+            let (state, share) = prep_init_draft09(
+                vdaf,
+                verify_key,
+                agg_id,
+                nonce,
+                public_share_data,
+                input_share_data,
+            )?;
+            Ok((
+                VdafPrepState::Prio3Draft09Field64HmacSha256Aes128(state),
+                VdafPrepShare::Prio3Draft09Field64HmacSha256Aes128(share),
+            ))
+        }
+        _ => {
+            return Err(VdafError::Dap(fatal_error!(
+                err = "unhandled config and verify key combination",
+            )))
+        }
+    };
+
+    type Prio3Draft09Prepared<T, const SEED_SIZE: usize> = (
+        Prio3PrepareState<<T as Type>::Field, SEED_SIZE>,
+        Prio3PrepareShare<<T as Type>::Field, SEED_SIZE>,
+    );
+
+    fn prep_init_draft09<T, P, const SEED_SIZE: usize>(
+        vdaf: Prio3<T, P, SEED_SIZE>,
+        verify_key: &[u8; SEED_SIZE],
+        agg_id: usize,
+        nonce: &[u8; 16],
+        public_share_data: &[u8],
+        input_share_data: &[u8],
+    ) -> Result<Prio3Draft09Prepared<T, SEED_SIZE>, VdafError>
+    where
+        T: Type,
+        P: Xof<SEED_SIZE>,
+    {
+        // Parse the public share.
+        let public_share = Prio3PublicShare::get_decoded_with_param(&vdaf, public_share_data)?;
+
+        // Parse the input share.
+        let input_share =
+            Prio3InputShare::get_decoded_with_param(&(&vdaf, agg_id), input_share_data)?;
+
+        // Run the prepare-init algorithm, returning the initial state.
+        Ok(vdaf.prepare_init(verify_key, agg_id, &(), nonce, &public_share, &input_share)?)
+    }
+}
+
+/// Consume the prep shares and return our output share and the prep message.
+pub(crate) fn prio3_draft09_prep_finish_from_shares(
+    config: &Prio3Config,
+    agg_id: usize,
+    host_state: VdafPrepState,
+    host_share: VdafPrepShare,
+    peer_share_data: &[u8],
+) -> Result<(VdafAggregateShare, Vec<u8>), VdafError> {
+    let (agg_share, outbound) = match (&config, host_state, host_share) {
+        (
+            Prio3Config::Count,
+            VdafPrepState::Prio3Draft09Field64(state),
+            VdafPrepShare::Prio3Draft09Field64(share),
+        ) => {
+            let vdaf = Prio3::new_count(2).map_err(|e| {
+                VdafError::Dap(
+                    fatal_error!(err = ?e, "failed to create prio3 count num_aggregators(2)"),
+                )
+            })?;
+            let (out_share, outbound) =
+                prep_finish_from_shares_draft09(&vdaf, agg_id, state, share, peer_share_data)?;
+            let agg_share = VdafAggregateShare::Field64Draft09(vdaf.aggregate(&(), [out_share])?);
+            (agg_share, outbound)
+        }
+        (
+            Prio3Config::Histogram {
+                length,
+                chunk_length,
+            },
+            VdafPrepState::Prio3Draft09Field128(state),
+            VdafPrepShare::Prio3Draft09Field128(share),
+        ) => {
+            let vdaf = Prio3::new_histogram(2, *length, *chunk_length)
+                .map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3 histogram from num_aggregators(2), length({length}), chunk_length({chunk_length})")))?;
+            let (out_share, outbound) =
+                prep_finish_from_shares_draft09(&vdaf, agg_id, state, share, peer_share_data)?;
+            let agg_share = VdafAggregateShare::Field128Draft09(vdaf.aggregate(&(), [out_share])?);
+            (agg_share, outbound)
+        }
+        (
+            Prio3Config::Sum { bits },
+            VdafPrepState::Prio3Draft09Field128(state),
+            VdafPrepShare::Prio3Draft09Field128(share),
+        ) => {
+            let vdaf =
+                Prio3::new_sum(2, *bits).map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3 sum from num_aggregators(2), bits({bits})")))?;
+            let (out_share, outbound) =
+                prep_finish_from_shares_draft09(&vdaf, agg_id, state, share, peer_share_data)?;
+            let agg_share = VdafAggregateShare::Field128Draft09(vdaf.aggregate(&(), [out_share])?);
+            (agg_share, outbound)
+        }
+        (
+            Prio3Config::SumVec {
+                bits,
+                length,
+                chunk_length,
+            },
+            VdafPrepState::Prio3Draft09Field128(state),
+            VdafPrepShare::Prio3Draft09Field128(share),
+        ) => {
+            let vdaf = Prio3::new_sum_vec(2, *bits, *length, *chunk_length)
+                .map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3 sum vec from num_aggregators(2), bits({bits}), length({length}), chunk_length({chunk_length})")))?;
+            let (out_share, outbound) =
+                prep_finish_from_shares_draft09(&vdaf, agg_id, state, share, peer_share_data)?;
+            let agg_share = VdafAggregateShare::Field128Draft09(vdaf.aggregate(&(), [out_share])?);
+            (agg_share, outbound)
+        }
+        (
+            Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
+                bits,
+                length,
+                chunk_length,
+                num_proofs,
+            },
+            VdafPrepState::Prio3Draft09Field64HmacSha256Aes128(state),
+            VdafPrepShare::Prio3Draft09Field64HmacSha256Aes128(share),
+        ) => {
+            let vdaf = new_prio3_sum_vec_field64_multiproof_hmac_sha256_aes128(
+                *bits,
+                *length,
+                *chunk_length,
+                *num_proofs,
+            )?;
+            let (out_share, outbound) =
+                prep_finish_from_shares_draft09(&vdaf, agg_id, state, share, peer_share_data)?;
+            let agg_share = VdafAggregateShare::Field64Draft09(vdaf.aggregate(&(), [out_share])?);
+            (agg_share, outbound)
+        }
+        _ => {
+            return Err(VdafError::Dap(fatal_error!(
+                err = format!("prio3_prep_finish_from_shares: {ERR_FIELD_TYPE}")
+            )))
+        }
+    };
+
+    Ok((agg_share, outbound))
+}
+
+/// Consume the prep message and output our output share.
+pub(crate) fn prio3_draft09_prep_finish(
+    config: &Prio3Config,
+    host_state: VdafPrepState,
+    peer_message_data: &[u8],
+) -> Result<VdafAggregateShare, VdafError> {
+    let agg_share = match (&config, host_state) {
+        (Prio3Config::Count, VdafPrepState::Prio3Draft09Field64(state)) => {
+            let vdaf = Prio3::new_count(2).map_err(|e| {
+                VdafError::Dap(
+                    fatal_error!(err = ?e, "failed to create prio3 count from num_aggregators(2)"),
+                )
+            })?;
+            let out_share = prep_finish_draft09(&vdaf, state, peer_message_data)?;
+            VdafAggregateShare::Field64Draft09(vdaf.aggregate(&(), [out_share])?)
+        }
+        (
+            Prio3Config::Histogram {
+                length,
+                chunk_length,
+            },
+            VdafPrepState::Prio3Draft09Field128(state),
+        ) => {
+            let vdaf = Prio3::new_histogram(2, *length, *chunk_length)
+                .map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3 histogram from num_aggregators(2), length({length}), chunk_length({chunk_length})")))?;
+            let out_share = prep_finish_draft09(&vdaf, state, peer_message_data)?;
+            VdafAggregateShare::Field128Draft09(vdaf.aggregate(&(), [out_share])?)
+        }
+        (Prio3Config::Sum { bits }, VdafPrepState::Prio3Draft09Field128(state)) => {
+            let vdaf =
+                Prio3::new_sum(2, *bits).map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3 sum from num_aggregators(2), bits({bits})")))?;
+            let out_share = prep_finish_draft09(&vdaf, state, peer_message_data)?;
+            VdafAggregateShare::Field128Draft09(vdaf.aggregate(&(), [out_share])?)
+        }
+        (
+            Prio3Config::SumVec {
+                bits,
+                length,
+                chunk_length,
+            },
+            VdafPrepState::Prio3Draft09Field128(state),
+        ) => {
+            let vdaf = Prio3::new_sum_vec(2, *bits, *length, *chunk_length)
+                .map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3 sum vec from num_aggregators(2), bits({bits}), length({length}), chunk_length({chunk_length})")))?;
+            let out_share = prep_finish_draft09(&vdaf, state, peer_message_data)?;
+            VdafAggregateShare::Field128Draft09(vdaf.aggregate(&(), [out_share])?)
+        }
+        (
+            Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
+                bits,
+                length,
+                chunk_length,
+                num_proofs,
+            },
+            VdafPrepState::Prio3Draft09Field64HmacSha256Aes128(state),
+        ) => {
+            let vdaf = new_prio3_sum_vec_field64_multiproof_hmac_sha256_aes128(
+                *bits,
+                *length,
+                *chunk_length,
+                *num_proofs,
+            )?;
+            let out_share = prep_finish_draft09(&vdaf, state, peer_message_data)?;
+            VdafAggregateShare::Field64Draft09(vdaf.aggregate(&(), [out_share])?)
+        }
+
+        _ => {
+            return Err(VdafError::Dap(fatal_error!(
+                err = format!("prio3_prep_finish: {ERR_FIELD_TYPE}")
+            )))
+        }
+    };
+
+    Ok(agg_share)
+}
+
+/// Interpret `agg_shares` as a sequence of encoded aggregate shares and unshard them.
+pub(crate) fn prio3_draft09_unshard<M: IntoIterator<Item = Vec<u8>>>(
+    config: &Prio3Config,
+    num_measurements: usize,
+    agg_shares: M,
+) -> Result<DapAggregateResult, VdafError> {
+    match config {
+        Prio3Config::Count => {
+            let vdaf = Prio3::new_count(2).map_err(|e| {
+                VdafError::Dap(
+                    fatal_error!(err = ?e, "failed to create prio3 count from num_aggregators(2)"),
+                )
+            })?;
+            let agg_res = unshard_draft09(&vdaf, num_measurements, agg_shares)?;
+            Ok(DapAggregateResult::U64(agg_res))
+        }
+        Prio3Config::Histogram {
+            length,
+            chunk_length,
+        } => {
+            let vdaf = Prio3::new_histogram(2, *length, *chunk_length)
+                .map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3 histogram from num_aggregators(2), length({length}), chunk_length({chunk_length})")))?;
+            let agg_res = unshard_draft09(&vdaf, num_measurements, agg_shares)?;
+            Ok(DapAggregateResult::U128Vec(agg_res))
+        }
+        Prio3Config::Sum { bits } => {
+            let vdaf =
+                Prio3::new_sum(2, *bits).map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3 sum from num_aggregators(2), bits({bits})")))?;
+            let agg_res = unshard_draft09(&vdaf, num_measurements, agg_shares)?;
+            Ok(DapAggregateResult::U128(agg_res))
+        }
+        Prio3Config::SumVec {
+            bits,
+            length,
+            chunk_length,
+        } => {
+            let vdaf = Prio3::new_sum_vec(2, *bits, *length, *chunk_length)
+                .map_err(|e| VdafError::Dap(fatal_error!(err = ?e, "failed to create prio3 sum vec from num_aggregators(2), bits({bits}), length({length}), chunk_length({chunk_length})")))?;
+            let agg_res = unshard_draft09(&vdaf, num_measurements, agg_shares)?;
+            Ok(DapAggregateResult::U128Vec(agg_res))
+        }
+        Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
+            bits,
+            length,
+            chunk_length,
+            num_proofs,
+        } => {
+            let vdaf = new_prio3_sum_vec_field64_multiproof_hmac_sha256_aes128(
+                *bits,
+                *length,
+                *chunk_length,
+                *num_proofs,
+            )?;
+            let agg_res = unshard_draft09(&vdaf, num_measurements, agg_shares)?;
+            Ok(DapAggregateResult::U64Vec(agg_res))
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+
+    use prio_draft09::vdaf::prio3_test::check_test_vec;
+
+    use crate::{
+        hpke::HpkeKemId,
+        test_versions,
+        testing::AggregationJobTest,
+        vdaf::{
+            prio3_draft09::new_prio3_sum_vec_field64_multiproof_hmac_sha256_aes128, Prio3Config,
+            VdafConfig,
+        },
+        DapAggregateResult, DapAggregationParam, DapMeasurement, DapVersion,
+    };
+
+    fn roundtrip_count(version: DapVersion) {
+        let mut t = AggregationJobTest::new(
+            &VdafConfig::Prio3Draft09(Prio3Config::Count),
+            HpkeKemId::X25519HkdfSha256,
+            version,
+        );
+        let got = t.roundtrip(
+            DapAggregationParam::Empty,
+            vec![
+                DapMeasurement::U64(0),
+                DapMeasurement::U64(1),
+                DapMeasurement::U64(1),
+                DapMeasurement::U64(1),
+                DapMeasurement::U64(0),
+            ],
+        );
+        assert_eq!(got, DapAggregateResult::U64(3));
+    }
+
+    test_versions! { roundtrip_count }
+
+    fn roundtrip_sum(version: DapVersion) {
+        let mut t = AggregationJobTest::new(
+            &VdafConfig::Prio3Draft09(Prio3Config::Sum { bits: 23 }),
+            HpkeKemId::X25519HkdfSha256,
+            version,
+        );
+        let got = t.roundtrip(
+            DapAggregationParam::Empty,
+            vec![
+                DapMeasurement::U64(0),
+                DapMeasurement::U64(1),
+                DapMeasurement::U64(1337),
+                DapMeasurement::U64(4),
+                DapMeasurement::U64(0),
+            ],
+        );
+        assert_eq!(got, DapAggregateResult::U128(1342));
+    }
+
+    test_versions! { roundtrip_sum }
+
+    fn roundtrip_sum_vec(version: DapVersion) {
+        let mut t = AggregationJobTest::new(
+            &VdafConfig::Prio3Draft09(Prio3Config::SumVec {
+                bits: 23,
+                length: 2,
+                chunk_length: 1,
+            }),
+            HpkeKemId::X25519HkdfSha256,
+            version,
+        );
+        let got = t.roundtrip(
+            DapAggregationParam::Empty,
+            vec![
+                DapMeasurement::U128Vec(vec![1337, 0]),
+                DapMeasurement::U128Vec(vec![0, 1337]),
+                DapMeasurement::U128Vec(vec![1, 1]),
+            ],
+        );
+        assert_eq!(got, DapAggregateResult::U128Vec(vec![1338, 1338]));
+    }
+
+    test_versions! { roundtrip_sum_vec }
+
+    fn roundtrip_histogram(version: DapVersion) {
+        let mut t = AggregationJobTest::new(
+            &VdafConfig::Prio3Draft09(Prio3Config::Histogram {
+                length: 3,
+                chunk_length: 1,
+            }),
+            HpkeKemId::X25519HkdfSha256,
+            version,
+        );
+        let got = t.roundtrip(
+            DapAggregationParam::Empty,
+            vec![
+                DapMeasurement::U64(0),
+                DapMeasurement::U64(1),
+                DapMeasurement::U64(2),
+                DapMeasurement::U64(2),
+                DapMeasurement::U64(2),
+            ],
+        );
+        assert_eq!(got, DapAggregateResult::U128Vec(vec![1, 1, 3]));
+    }
+
+    test_versions! { roundtrip_histogram }
+
+    fn roundtrip_sum_vec_field64_multiproof_hmac_sha256_aes128(version: DapVersion) {
+        let mut t = AggregationJobTest::new(
+            &VdafConfig::Prio3Draft09(Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
+                bits: 23,
+                length: 2,
+                chunk_length: 1,
+                num_proofs: 4,
+            }),
+            HpkeKemId::X25519HkdfSha256,
+            version,
+        );
+        let got = t.roundtrip(
+            DapAggregationParam::Empty,
+            vec![
+                DapMeasurement::U64Vec(vec![1337, 0]),
+                DapMeasurement::U64Vec(vec![0, 1337]),
+                DapMeasurement::U64Vec(vec![1, 1]),
+            ],
+        );
+        assert_eq!(got, DapAggregateResult::U64Vec(vec![1338, 1338]));
+    }
+
+    test_versions! { roundtrip_sum_vec_field64_multiproof_hmac_sha256_aes128 }
+
+    #[test]
+    fn test_vec_sum_vec_field64_multiproof_hmac_sha256_aes128() {
+        for test_vec_json_str in [
+            include_str!("test_vec/Prio3SumVecField64MultiproofHmacSha256Aes128_0.json"),
+            include_str!("test_vec/Prio3SumVecField64MultiproofHmacSha256Aes128_1.json"),
+            include_str!("test_vec/Prio3SumVecField64MultiproofHmacSha256Aes128_2.json"),
+        ] {
+            check_test_vec(test_vec_json_str, |json_params, num_aggregators| {
+                assert_eq!(num_aggregators, 2);
+                new_prio3_sum_vec_field64_multiproof_hmac_sha256_aes128(
+                    json_params["bits"].as_u64().unwrap().try_into().unwrap(),
+                    json_params["length"].as_u64().unwrap().try_into().unwrap(),
+                    json_params["chunk_length"]
+                        .as_u64()
+                        .unwrap()
+                        .try_into()
+                        .unwrap(),
+                    json_params["proofs"].as_u64().unwrap().try_into().unwrap(),
+                )
+                .unwrap()
+            });
+        }
+    }
+}


Test patch:
diff --git a/crates/dapf/src/acceptance/load_testing.rs b/crates/dapf/src/acceptance/load_testing.rs
index a866d56..e77fd5c 100644
--- a/crates/dapf/src/acceptance/load_testing.rs
+++ b/crates/dapf/src/acceptance/load_testing.rs
@@ -59,7 +59,7 @@ fn jobs_per_batch() -> impl Iterator<Item = usize> {
 fn vdaf_config_params() -> impl Iterator<Item = VdafConfig> {
     [
         VdafConfig::Prio2 { dimension: 99_992 },
-        VdafConfig::Prio3(
+        VdafConfig::Prio3Draft09(
             daphne::vdaf::Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
                 bits: 1,
                 length: 100_000,
@@ -67,7 +67,7 @@ fn vdaf_config_params() -> impl Iterator<Item = VdafConfig> {
                 num_proofs: 2,
             },
         ),
-        VdafConfig::Prio3(
+        VdafConfig::Prio3Draft09(
             daphne::vdaf::Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
                 bits: 1,
                 length: 100_000,
diff --git a/crates/daphne-server/tests/e2e/test_runner.rs b/crates/daphne-server/tests/e2e/test_runner.rs
index 1fd77bb..be79803 100644
--- a/crates/daphne-server/tests/e2e/test_runner.rs
+++ b/crates/daphne-server/tests/e2e/test_runner.rs
@@ -29,7 +29,7 @@ use std::{
 use tokio::time::timeout;
 use url::Url;
 
-const VDAF_CONFIG: &VdafConfig = &VdafConfig::Prio3(Prio3Config::Sum { bits: 10 });
+const VDAF_CONFIG: &VdafConfig = &VdafConfig::Prio3Draft09(Prio3Config::Sum { bits: 10 });
 pub(crate) const MIN_BATCH_SIZE: u64 = 10;
 pub(crate) const MAX_BATCH_SIZE: u32 = 12;
 pub(crate) const TIME_PRECISION: Duration = 3600; // seconds
@@ -170,7 +170,7 @@ impl TestRunner {
             "type": "Prio3Sum",
             "bits": assert_matches!(
                 t.task_config.vdaf,
-                VdafConfig::Prio3(Prio3Config::Sum{ bits }) => format!("{bits}")
+                VdafConfig::Prio3Draft09(Prio3Config::Sum{ bits }) => format!("{bits}")
             ),
         });
 
diff --git a/crates/daphne-service-utils/src/test_route_types.rs b/crates/daphne-service-utils/src/test_route_types.rs
index 794dde1..3e33c0a 100644
--- a/crates/daphne-service-utils/src/test_route_types.rs
+++ b/crates/daphne-service-utils/src/test_route_types.rs
@@ -35,6 +35,30 @@ pub struct InternalTestVdaf {
 impl From<VdafConfig> for InternalTestVdaf {
     fn from(vdaf: VdafConfig) -> Self {
         let (typ, bits, length, chunk_length) = match vdaf {
+            VdafConfig::Prio3Draft09(prio3) => match prio3 {
+                Prio3Config::Count => ("Prio3Count", None, None, None),
+                Prio3Config::Sum { bits } => ("Prio3Sum", Some(bits), None, None),
+                Prio3Config::Histogram {
+                    length,
+                    chunk_length,
+                } => ("Prio3Histogram", None, Some(length), Some(chunk_length)),
+                Prio3Config::SumVec {
+                    bits,
+                    length,
+                    chunk_length,
+                } => ("Prio3SumVec", Some(bits), Some(length), Some(chunk_length)),
+                Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
+                    bits,
+                    length,
+                    chunk_length,
+                    num_proofs: _unimplemented,
+                } => (
+                    "Prio3SumVecField64MultiproofHmacSha256Aes128",
+                    Some(bits),
+                    Some(length),
+                    Some(chunk_length),
+                ),
+            },
             VdafConfig::Prio3(prio3) => match prio3 {
                 Prio3Config::Count => ("Prio3Count", None, None, None),
                 Prio3Config::Sum { bits } => ("Prio3Sum", Some(bits), None, None),
diff --git a/crates/daphne/src/pine/test_vec/mod.rs b/crates/daphne/src/pine/test_vec/mod.rs
index 47a894f..585ee93 100644
--- a/crates/daphne/src/pine/test_vec/mod.rs
+++ b/crates/daphne/src/pine/test_vec/mod.rs
@@ -6,7 +6,7 @@ use crate::messages::taskprov::{
     VDAF_TYPE_PINE_FIELD32_HMAC_SHA256_AES128, VDAF_TYPE_PINE_FIELD64_HMAC_SHA256_AES128,
 };
 use crate::pine::{Pine, PineParam, ALPHA};
-use prio::{
+use prio_draft09::{
     codec::Encode,
     field::{FftFriendlyFieldElement, Field128, Field64},
     vdaf::{
@@ -14,7 +14,7 @@ use prio::{
         Aggregator, Collector, PrepareTransition,
     },
 };
-use prio::{field::FieldPrio2, vdaf::xof::XofHmacSha256Aes128};
+use prio_draft09::{field::FieldPrio2, vdaf::xof::XofHmacSha256Aes128};
 use serde::Deserialize;
 
 #[derive(Deserialize)]
diff --git a/crates/daphne/src/testing/mod.rs b/crates/daphne/src/testing/mod.rs
index c1fb4d3..16e49e3 100644
--- a/crates/daphne/src/testing/mod.rs
+++ b/crates/daphne/src/testing/mod.rs
@@ -210,6 +210,7 @@ impl AggregationJobTest {
     ) -> (DapAggregateSpan<DapAggregateShare>, AggregationJobResp) {
         self.task_config
             .produce_agg_job_resp(
+                self.task_id,
                 &HashMap::default(),
                 &agg_job_init_req.part_batch_sel.clone(),
                 &self
@@ -1112,10 +1113,11 @@ impl VdafConfig {
     pub fn gen_measurement(&self) -> Result<DapMeasurement, DapError> {
         match self {
             Self::Prio2 { dimension } => Ok(DapMeasurement::U32Vec(vec![1; *dimension])),
-            Self::Prio3(crate::vdaf::Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
-                length,
-                ..
-            }) => Ok(DapMeasurement::U64Vec(vec![0; *length])),
+            Self::Prio3Draft09(
+                crate::vdaf::Prio3Config::SumVecField64MultiproofHmacSha256Aes128 {
+                    length, ..
+                },
+            ) => Ok(DapMeasurement::U64Vec(vec![0; *length])),
             _ => Err(fatal_error!(
                 err = format!("gen_measurement_for currently does not support {self:?}")
             )),