From 836c825d3b0d627f7fc44c8183763169263c0a1a Mon Sep 17 00:00:00 2001
From: Tim Geoghegan <timg@divviup.org>
Date: Wed, 13 Sep 2023 17:01:09 -0700
Subject: [PATCH] Update domain separation strings for DAP-07

Relevant to #1669
---
 core/src/hpke.rs                      | 4 ++--
 integration_tests/tests/daphne.rs     | 2 +-
 integration_tests/tests/divviup_ts.rs | 6 +++---
 integration_tests/tests/in_cluster.rs | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/src/hpke.rs b/core/src/hpke.rs
index 033c5f053..8b36c298a 100644
--- a/core/src/hpke.rs
+++ b/core/src/hpke.rs
@@ -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",
         }
     }
 }
diff --git a/integration_tests/tests/daphne.rs b/integration_tests/tests/daphne.rs
index 8d949e411..03f7e57a5 100644
--- a/integration_tests/tests/daphne.rs
+++ b/integration_tests/tests/daphne.rs
@@ -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();
 
diff --git a/integration_tests/tests/divviup_ts.rs b/integration_tests/tests/divviup_ts.rs
index 674525482..50ad73478 100644
--- a/integration_tests/tests/divviup_ts.rs
+++ b/integration_tests/tests/divviup_ts.rs
@@ -36,7 +36,7 @@ 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();
 
@@ -44,7 +44,7 @@ async fn janus_divviup_ts_count() {
 }
 
 #[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();
 
@@ -52,7 +52,7 @@ async fn janus_divviup_ts_sum() {
 }
 
 #[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();
 
diff --git a/integration_tests/tests/in_cluster.rs b/integration_tests/tests/in_cluster.rs
index 5d49b1739..450a32f3e 100644
--- a/integration_tests/tests/in_cluster.rs
+++ b/integration_tests/tests/in_cluster.rs
@@ -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();