Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade libprio to alpha prerelease #3621

Merged
merged 1 commit into from
Jan 28, 2025
Merged

Upgrade libprio to alpha prerelease #3621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,7 @@ postgres-types = "0.2.8"
pretty_assertions = "1.4.1"
# Disable default features so that individual workspace crates can choose to
# re-enable them
# TODO(#3436): switch to a released version of libprio, once there is a released version implementing VDAF-13
# prio = { version = "0.16.7", default-features = false, features = ["experimental"] }
prio = { git = "https://github.com/divviup/libprio-rs", rev = "3c1aeb30c661d373566749a81589fc0a4045f89a", default-features = false, features = ["experimental"] }
prio = { version = "0.17.0-alpha.0", default-features = false, features = ["experimental"] }
prometheus = "0.13.4"
querystring = "1.1.0"
quickcheck = { version = "1.0.3", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion aggregator/src/aggregator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,7 @@ impl<C: Clock> TaskAggregator<C> {
}

VdafInstance::Prio3Sum { max_measurement } => {
let vdaf = Prio3::new_sum(2, u128::from(*max_measurement))?;
let vdaf = Prio3::new_sum(2, *max_measurement)?;
let verify_key = task.vdaf_verify_key()?;
VdafOps::Prio3Sum(Arc::new(vdaf), verify_key)
}
Expand Down
10 changes: 7 additions & 3 deletions aggregator/src/aggregator/aggregation_job_creator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ impl<C: Clock + 'static> AggregationJobCreator<C> {
}

(task::BatchMode::TimeInterval, VdafInstance::Prio3Sum { max_measurement }) => {
let vdaf = Arc::new(Prio3::new_sum(2, u128::from(*max_measurement))?);
let vdaf = Arc::new(Prio3::new_sum(2, *max_measurement)?);
self.create_aggregation_jobs_for_time_interval_task_no_param::<VERIFY_KEY_LENGTH, Prio3Sum>(task, vdaf)
.await
}
Expand Down Expand Up @@ -402,7 +402,11 @@ impl<C: Clock + 'static> AggregationJobCreator<C> {
VdafInstance::Prio3Count,
) => {
let vdaf: Arc<
Prio3<prio::flp::types::Count<Field64>, vdaf::xof::XofTurboShake128, 16>,
Prio3<
prio::flp::types::Count<Field64>,
vdaf::xof::XofTurboShake128,
VERIFY_KEY_LENGTH,
>,
> = Arc::new(Prio3::new_count(2)?);
let batch_time_window_size = *batch_time_window_size;
self.create_aggregation_jobs_for_leader_selected_task_no_param::<
Expand All @@ -417,7 +421,7 @@ impl<C: Clock + 'static> AggregationJobCreator<C> {
},
VdafInstance::Prio3Sum { max_measurement },
) => {
let vdaf = Arc::new(Prio3::new_sum(2, u128::from(*max_measurement))?);
let vdaf = Arc::new(Prio3::new_sum(2, *max_measurement)?);
let batch_time_window_size = *batch_time_window_size;
self.create_aggregation_jobs_for_leader_selected_task_no_param::<
VERIFY_KEY_LENGTH,
Expand Down
51 changes: 43 additions & 8 deletions aggregator_api/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ use janus_core::{
hpke::HpkeKeypair,
test_util::install_test_trace_subscriber,
time::MockClock,
vdaf::{vdaf_dp_strategies, VdafInstance},
vdaf::{vdaf_dp_strategies, VdafInstance, VERIFY_KEY_LENGTH},
};
use janus_messages::{
Duration, HpkeAeadId, HpkeConfig, HpkeConfigId, HpkeKdfId, HpkeKemId, HpkePublicKey, Role,
Expand Down Expand Up @@ -183,7 +183,12 @@ async fn post_task_bad_role() {
// Setup: create a datastore & handler.
let (handler, _ephemeral_datastore, _) = setup_api_test().await;

let vdaf_verify_key = SecretBytes::new(thread_rng().sample_iter(Standard).take(16).collect());
let vdaf_verify_key = SecretBytes::new(
thread_rng()
.sample_iter(Standard)
.take(VERIFY_KEY_LENGTH)
.collect(),
);
let aggregator_auth_token = AuthenticationToken::DapAuth(random());

let req = PostTaskReq {
Expand Down Expand Up @@ -217,7 +222,12 @@ async fn post_task_unauthorized() {
// Setup: create a datastore & handler.
let (handler, _ephemeral_datastore, _) = setup_api_test().await;

let vdaf_verify_key = SecretBytes::new(thread_rng().sample_iter(Standard).take(16).collect());
let vdaf_verify_key = SecretBytes::new(
thread_rng()
.sample_iter(Standard)
.take(VERIFY_KEY_LENGTH)
.collect(),
);
let aggregator_auth_token = AuthenticationToken::DapAuth(random());

let req = PostTaskReq {
Expand Down Expand Up @@ -252,7 +262,12 @@ async fn post_task_helper_no_optional_fields() {
// Setup: create a datastore & handler.
let (handler, _ephemeral_datastore, ds) = setup_api_test().await;

let vdaf_verify_key = SecretBytes::new(thread_rng().sample_iter(Standard).take(16).collect());
let vdaf_verify_key = SecretBytes::new(
thread_rng()
.sample_iter(Standard)
.take(VERIFY_KEY_LENGTH)
.collect(),
);

// Verify: posting a task creates a new task which matches the request.
let req = PostTaskReq {
Expand Down Expand Up @@ -332,7 +347,12 @@ async fn post_task_helper_with_aggregator_auth_token() {
// Setup: create a datastore & handler.
let (handler, _ephemeral_datastore, _) = setup_api_test().await;

let vdaf_verify_key = SecretBytes::new(thread_rng().sample_iter(Standard).take(16).collect());
let vdaf_verify_key = SecretBytes::new(
thread_rng()
.sample_iter(Standard)
.take(VERIFY_KEY_LENGTH)
.collect(),
);
let aggregator_auth_token = AuthenticationToken::DapAuth(random());

// Verify: posting a task with role = helper and an aggregator auth token fails
Expand Down Expand Up @@ -368,7 +388,12 @@ async fn post_task_idempotence() {
let (handler, ephemeral_datastore, _) = setup_api_test().await;
let ds = ephemeral_datastore.datastore(MockClock::default()).await;

let vdaf_verify_key = SecretBytes::new(thread_rng().sample_iter(Standard).take(16).collect());
let vdaf_verify_key = SecretBytes::new(
thread_rng()
.sample_iter(Standard)
.take(VERIFY_KEY_LENGTH)
.collect(),
);
let aggregator_auth_token = AuthenticationToken::DapAuth(random());

// Verify: posting a task creates a new task which matches the request.
Expand Down Expand Up @@ -442,7 +467,12 @@ async fn post_task_leader_all_optional_fields() {
// Setup: create a datastore & handler.
let (handler, _ephemeral_datastore, ds) = setup_api_test().await;

let vdaf_verify_key = SecretBytes::new(thread_rng().sample_iter(Standard).take(16).collect());
let vdaf_verify_key = SecretBytes::new(
thread_rng()
.sample_iter(Standard)
.take(VERIFY_KEY_LENGTH)
.collect(),
);
let aggregator_auth_token = AuthenticationToken::DapAuth(random());
let collector_auth_token_hash = AuthenticationTokenHash::from(&random());
// Verify: posting a task creates a new task which matches the request.
Expand Down Expand Up @@ -522,7 +552,12 @@ async fn post_task_leader_no_aggregator_auth_token() {
// Setup: create a datastore & handler.
let (handler, _ephemeral_datastore, _) = setup_api_test().await;

let vdaf_verify_key = SecretBytes::new(thread_rng().sample_iter(Standard).take(16).collect());
let vdaf_verify_key = SecretBytes::new(
thread_rng()
.sample_iter(Standard)
.take(VERIFY_KEY_LENGTH)
.collect(),
);

// Verify: posting a task with role = Leader and no aggregator auth token fails
let req = PostTaskReq {
Expand Down
2 changes: 1 addition & 1 deletion core/src/dp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ impl AggregatorWithNoise<0, 16, NoDifferentialPrivacy> for dummy::Vdaf {
}

// identity strategy implementations for vdafs from libprio
impl TypeWithNoise<NoDifferentialPrivacy> for prio::flp::types::Sum<Field128> {
impl TypeWithNoise<NoDifferentialPrivacy> for prio::flp::types::Sum<Field64> {
fn add_noise_to_result(
&self,
_dp_strategy: &NoDifferentialPrivacy,
Expand Down
4 changes: 2 additions & 2 deletions core/src/vdaf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use std::str;

/// The length of the verify key parameter for Prio3 VDAF instantiations using
/// [`XofTurboShake128`][prio::vdaf::xof::XofTurboShake128].
pub const VERIFY_KEY_LENGTH: usize = 16;
pub const VERIFY_KEY_LENGTH: usize = 32;

/// Private use algorithm ID for a customized version of Prio3SumVec. This value was chosen for
/// interoperability with Daphne.
Expand Down Expand Up @@ -265,7 +265,7 @@ macro_rules! vdaf_dispatch_impl_base {
}

::janus_core::vdaf::VdafInstance::Prio3Sum { max_measurement } => {
let $vdaf = ::prio::vdaf::prio3::Prio3::new_sum(2, *max_measurement as u128)?;
let $vdaf = ::prio::vdaf::prio3::Prio3::new_sum(2, *max_measurement)?;
type $Vdaf = ::prio::vdaf::prio3::Prio3Sum;
const $VERIFY_KEY_LEN: usize = ::janus_core::vdaf::VERIFY_KEY_LENGTH;
type $DpStrategy = janus_core::dp::NoDifferentialPrivacy;
Expand Down
2 changes: 1 addition & 1 deletion integration_tests/tests/integration/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ pub async fn submit_measurements_and_verify_aggregate(
.await;
}
VdafInstance::Prio3Sum { max_measurement } => {
let max_measurement = u128::from(*max_measurement);
let max_measurement = *max_measurement;
let vdaf = Prio3::new_sum(2, max_measurement).unwrap();

let measurements: Vec<_> =
Expand Down
Loading
Loading