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.

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

Combined helper measurement and helper proof seeds #1167

Merged
merged 5 commits into from
Jan 6, 2025
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Merge branch 'main' into combine-meas-and-proof-seeds
  • Loading branch information
Michael Rosenberg committed Jan 6, 2025

Verified

This commit was signed with the committer’s verified signature.
MindTooth Birger Johan Nordølum
commit 392f68d49222613bb63021e40ea41b169f5f561b
16 changes: 8 additions & 8 deletions src/vdaf/prio3.rs
Original file line number Diff line number Diff line change
@@ -608,8 +608,8 @@ where
let meas_and_proof_share_seed = random_seeds.next().unwrap().try_into().unwrap();
let measurement_share_prng: Prng<T::Field, _> = Prng::from_seed_stream(P::seed_stream(
&Seed(meas_and_proof_share_seed),
&self.domain_separation_tag(DST_MEASUREMENT_SHARE, ctx),
&[agg_id],
&[&self.domain_separation_tag(DST_MEASUREMENT_SHARE), ctx],
&[&[agg_id]],
));
let joint_rand_blind = if let Some(helper_joint_rand_parts) =
helper_joint_rand_parts.as_mut()
@@ -1375,8 +1375,8 @@ where
let measurement_share = Cow::Owned(
P::seed_stream(
meas_and_proofs_share,
&self.domain_separation_tag(DST_MEASUREMENT_SHARE, ctx),
&[agg_id],
&[&self.domain_separation_tag(DST_MEASUREMENT_SHARE), ctx],
&[&[agg_id]],
)
.into_field_vec(self.typ.input_len()),
);
@@ -1392,8 +1392,8 @@ where
// Compute the joint randomness.
let (joint_rand_seed, joint_rand_part, joint_rands) = if self.typ.joint_rand_len() > 0 {
let mut joint_rand_part_xof = P::init(
msg.joint_rand_blind().unwrap().as_ref(),
&self.domain_separation_tag(DST_JOINT_RAND_PART, ctx),
msg.joint_rand_blind().as_ref().unwrap().as_ref(),
&[&self.domain_separation_tag(DST_JOINT_RAND_PART), ctx],
);
joint_rand_part_xof.update(&[agg_id]);
joint_rand_part_xof.update(nonce);
@@ -1854,7 +1854,7 @@ mod tests {
assert_matches!(
&mut input_shares[0],
Prio3InputShare::Leader { ref mut measurement_share, ..} => {
measurement_share[0] += Field128::one();
measurement_share[0] += Field64::one();
}
);
let result = run_vdaf_prepare(
@@ -1872,7 +1872,7 @@ mod tests {
assert_matches!(
&mut input_shares[0],
Prio3InputShare::Leader { ref mut proofs_share, ..} => {
proofs_share[0] += Field128::one();
proofs_share[0] += Field64::one();
}
);
let result = run_vdaf_prepare(
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.