Skip to content

Commit

Permalink
Update domain separation strings for DAP-07
Browse files Browse the repository at this point in the history
Relevant to #1669
  • Loading branch information
tgeoghegan committed Sep 14, 2023
1 parent ae56c00 commit 836c825
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions core/src/hpke.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ impl Label {
/// Get the message-specific portion of the application info string for this label.
pub fn as_bytes(&self) -> &'static [u8] {
match self {
Self::InputShare => b"dap-04 input share",
Self::AggregateShare => b"dap-04 aggregate share",
Self::InputShare => b"dap-07 input share",
Self::AggregateShare => b"dap-07 aggregate share",
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion integration_tests/tests/daphne.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ async fn daphne_janus() {

// This test places Janus in the leader role & Daphne in the helper role.
#[tokio::test(flavor = "multi_thread")]
#[ignore = "Daphne does not currently support DAP-06 (issue #1669)"]
#[ignore = "Daphne does not currently support DAP-07 (issue #1669)"]
async fn janus_daphne() {
install_test_trace_subscriber();

Expand Down
6 changes: 3 additions & 3 deletions integration_tests/tests/divviup_ts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,23 @@ async fn run_divviup_ts_integration_test(container_client: &Cli, vdaf: VdafInsta
}

#[tokio::test(flavor = "multi_thread")]
#[ignore = "divviup-ts does not currently support DAP-06 (issue #1669)"]
#[ignore = "divviup-ts does not currently support DAP-07 (issue #1669)"]
async fn janus_divviup_ts_count() {
install_test_trace_subscriber();

run_divviup_ts_integration_test(&container_client(), VdafInstance::Prio3Count).await;
}

#[tokio::test(flavor = "multi_thread")]
#[ignore = "divviup-ts does not currently support DAP-06 (issue #1669)"]
#[ignore = "divviup-ts does not currently support DAP-07 (issue #1669)"]
async fn janus_divviup_ts_sum() {
install_test_trace_subscriber();

run_divviup_ts_integration_test(&container_client(), VdafInstance::Prio3Sum { bits: 8 }).await;
}

#[tokio::test(flavor = "multi_thread")]
#[ignore = "divviup-ts does not currently support DAP-06 (issue #1669)"]
#[ignore = "divviup-ts does not currently support DAP-07 (issue #1669)"]
async fn janus_divviup_ts_histogram() {
install_test_trace_subscriber();

Expand Down
2 changes: 1 addition & 1 deletion integration_tests/tests/in_cluster.rs
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ async fn in_cluster_sum() {
}

#[tokio::test(flavor = "multi_thread")]
#[ignore = "divviup-api does not currently support DAP-06 (https://github.com/divviup/divviup-api/issues/410)"]
#[ignore = "divviup-api does not currently support DAP-07 (https://github.com/divviup/divviup-api/issues/410)"]
async fn in_cluster_histogram() {
install_test_trace_subscriber();

Expand Down

0 comments on commit 836c825

Please sign in to comment.