Upgrade prio to 0.16.0

Cargo.toml

@@ -38,7 +38,7 @@ hpke-rs-rust-crypto = "0.2.0"
 http = "0.2"
 matchit = "0.7.3"
 paste = "1.0.14"
-prio = { git = "https://github.com/divviup/libprio-rs", rev = "d0168336bbad1805231a69181b329e37ee962203" }
+prio = "0.16.0"
 prometheus = "0.13.3"
 rand = "0.8.5"
 rand_core = "0.6.4"

daphne/Cargo.toml

@@ -27,7 +27,7 @@ hex.workspace = true
 hpke-rs = { workspace = true, features = ["hazmat", "serialization"] }
 hpke-rs-crypto.workspace = true
 hpke-rs-rust-crypto.workspace = true
-prio = { workspace = true, features = ["prio2"] }
+prio = { workspace = true, features = ["experimental"] }
 prometheus.workspace = true
 rand.workspace = true
 replace_with.workspace = true

daphne/dapf/src/bin/dapf.rs

@@ -161,7 +161,7 @@ async fn main() -> Result<()> {
             );
             let resp = http_client
                 .post(Url::parse(leader_url)?.join("upload")?)
-                .body(report.get_encoded_with_param(&version))
+                .body(report.get_encoded_with_param(&version)?)
                 .headers(headers)
                 .send()
                 .await?;
@@ -217,7 +217,7 @@ async fn main() -> Result<()> {
 
             let resp = http_client
                 .post(Url::parse(leader_url)?.join("collect")?)
-                .body(collect_req.get_encoded_with_param(&version))
+                .body(collect_req.get_encoded_with_param(&version)?)
                 .headers(headers)
                 .send()
                 .await?;

daphne/src/error/mod.rs

@@ -7,6 +7,7 @@ use std::fmt::{Debug, Display};
 
 use crate::{messages::TransitionFailure, vdaf::VdafError};
 pub use aborts::DapAbort;
+use prio::codec::CodecError;
 
 use self::aborts::ProblemDetails;
 
@@ -45,6 +46,13 @@ impl DapError {
             detail: None,
         }
     }
+
+    /// Construct a fatal encoding error.
+    pub fn encoding(e: CodecError) -> DapError {
+        DapError::Fatal(FatalDapError(format!(
+            "encountered fatal error during encoding: {e}"
+        )))
+    }
 }
 
 impl FatalDapError {
@@ -57,15 +65,15 @@ impl FatalDapError {
 impl From<VdafError> for DapError {
     fn from(e: VdafError) -> Self {
         match e {
-            VdafError::Codec(..) | VdafError::Vdaf(..) => {
+            VdafError::Codec(..) | VdafError::Vdaf(..) | VdafError::Uncategorized(..) => {
                 Self::Transition(TransitionFailure::VdafPrepError)
             }
         }
     }
 }
 
 #[derive(PartialEq, Eq)]
-pub struct FatalDapError(String);
+pub struct FatalDapError(pub(crate) String);
 
 impl std::error::Error for FatalDapError {}
 

daphne/src/hpke.rs

@@ -362,9 +362,10 @@ impl HpkeDecrypter for HpkeReceiverConfig {
 }
 
 impl Encode for HpkeReceiverConfig {
-    fn encode(&self, bytes: &mut Vec<u8>) {
-        self.config.encode(bytes);
-        encode_u16_bytes(bytes, self.private_key.as_slice());
+    fn encode(&self, bytes: &mut Vec<u8>) -> Result<(), CodecError> {
+        self.config.encode(bytes)?;
+        encode_u16_bytes(bytes, self.private_key.as_slice())?;
+        Ok(())
     }
 }