Update key derivation labels for handshake mode.

bramble-api/src/main/java/org/briarproject/bramble/api/transport/TransportConstants.java

@@ -82,53 +82,58 @@ public interface TransportConstants {
 	int REORDERING_WINDOW_SIZE = 32;
 
 	/**
-	 * Label for deriving Alice's initial tag key from the root key.
+	 * Label for deriving Alice's initial tag key from the root key in
+	 * rotation mode.
 	 */
 	String ALICE_TAG_LABEL = "org.briarproject.bramble.transport/ALICE_TAG_KEY";
 
 	/**
-	 * Label for deriving Bob's initial tag key from the root key.
+	 * Label for deriving Bob's initial tag key from the root key in rotation
+	 * mode.
 	 */
 	String BOB_TAG_LABEL = "org.briarproject.bramble.transport/BOB_TAG_KEY";
 
 	/**
-	 * Label for deriving Alice's initial header key from the root key.
+	 * Label for deriving Alice's initial header key from the root key in
+	 * rotation mode.
 	 */
 	String ALICE_HEADER_LABEL =
 			"org.briarproject.bramble.transport/ALICE_HEADER_KEY";
 
 	/**
-	 * Label for deriving Bob's initial header key from the root key.
+	 * Label for deriving Bob's initial header key from the root key in
+	 * rotation mode.
 	 */
 	String BOB_HEADER_LABEL =
 			"org.briarproject.bramble.transport/BOB_HEADER_KEY";
 
 	/**
-	 * Label for deriving the next period's key in key rotation.
+	 * Label for deriving the next period's key in rotation mode.
 	 */
 	String ROTATE_LABEL = "org.briarproject.bramble.transport/ROTATE";
 
 	/**
-	 * Label for deriving Alice's handshake tag key from the root key.
+	 * Label for deriving Alice's tag key from the root key in handshake mode.
 	 */
 	String ALICE_HANDSHAKE_TAG_LABEL =
-			"org.briarproject.bramble.transport/ALICE_STATIC_TAG_KEY";
+			"org.briarproject.bramble.transport/ALICE_HANDSHAKE_TAG_KEY";
 
 	/**
-	 * Label for deriving Bob's handshake tag key from the root key.
+	 * Label for deriving Bob's tag key from the root key in handshake mode.
 	 */
 	String BOB_HANDSHAKE_TAG_LABEL =
-			"org.briarproject.bramble.transport/BOB_STATIC_TAG_KEY";
+			"org.briarproject.bramble.transport/BOB_HANDSHAKE_TAG_KEY";
 
 	/**
-	 * Label for deriving Alice's handshake header key from the root key.
+	 * Label for deriving Alice's header key from the root key in handshake
+	 * mode.
 	 */
 	String ALICE_HANDSHAKE_HEADER_LABEL =
-			"org.briarproject.bramble.transport/ALICE_STATIC_HEADER_KEY";
+			"org.briarproject.bramble.transport/ALICE_HANDSHAKE_HEADER_KEY";
 
 	/**
-	 * Label for deriving Bob's handshake header key from the root key.
+	 * Label for deriving Bob's header key from the root key in handshake mode.
 	 */
 	String BOB_HANDSHAKE_HEADER_LABEL =
-			"org.briarproject.bramble.transport/BOB_STATIC_HEADER_KEY";
+			"org.briarproject.bramble.transport/BOB_HANDSHAKE_HEADER_KEY";
 }