commit 78b3337a10a7f7b3495b6cb8140a74e265290898
author Steven Valdez <svaldez@chromium.org> Thu May 14 15:00:28 2020 -0400
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Thu May 14 19:21:22 2020 +0000
tree 58f9819a46b1579b6c6e14d3dedd5c9811b15e0e
parent 3e4dfbb2f81493e1f25b3ce83fee3ed999373a6c

Fix TRUST_TOKEN experiment_v1 SRR map.

Change-Id: I9e5c9b016cc0b3b7926df850d470e6367eb9c0bc
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/41364
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>

crypto/trust_token/trust_token.c

diff --git a/crypto/trust_token/trust_token.c b/crypto/trust_token/trust_token.c
index 448def8..1ade23e 100644
--- a/crypto/trust_token/trust_token.c
+++ b/crypto/trust_token/trust_token.c
@@ -625,8 +625,13 @@
   assert(strlen(kClientDataLabel) < strlen(kExpiryTimestampLabel));
   assert(strlen(kPublicLabel) < strlen(kPrivateLabel));
 
+  size_t map_entries = 3;
+  if (ctx->method->use_token_hash) {
+    map_entries = 4;
+  }
+
   if (!CBB_init(&srr, 0) ||
-      !add_cbor_map(&srr, 3) ||  // SRR map
+      !add_cbor_map(&srr, map_entries) ||  // SRR map
       !add_cbor_text(&srr, kMetadataLabel, strlen(kMetadataLabel)) ||
       !add_cbor_map(&srr, 2) ||  // Metadata map
       !add_cbor_text(&srr, kPublicLabel, strlen(kPublicLabel)) ||

crypto/trust_token/trust_token_test.cc

diff --git a/crypto/trust_token/trust_token_test.cc b/crypto/trust_token/trust_token_test.cc
index bbb7a8a..41bf55d 100644
--- a/crypto/trust_token/trust_token_test.cc
+++ b/crypto/trust_token/trust_token_test.cc
@@ -462,7 +462,7 @@
         "\x65\x73\x74\x61\x6d\x70\x1a\x00\xcc\x15\x7a";
 
     const uint8_t kExpectedSRRTokenHash[] =
-        "\xa3\x68\x6d\x65\x74\x61\x64\x61\x74\x61\xa2\x66\x70\x75\x62\x6c\x69"
+        "\xa4\x68\x6d\x65\x74\x61\x64\x61\x74\x61\xa2\x66\x70\x75\x62\x6c\x69"
         "\x63\x00\x67\x70\x72\x69\x76\x61\x74\x65\x00\x6a\x74\x6f\x6b\x65\x6e"
         "\x2d\x68\x61\x73\x68\x58\x20\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
         "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"