commit 9016b8193a2213c7996a69f6493ed722a5d21104
author Archie Pusaka <apusaka@chromium.org> Thu Jul 30 03:09:40 2020 +0000
committer Archie Pusaka <apusaka@chromium.org> Thu Jul 30 03:20:24 2020 +0000
tree b0ea98d25b754d0ad2876ed199a2e0015dea1354
parent 366f1a9979b3aa95a1b9379e56cc5d15b477f63f

Revert "u2fd: Adjust tests for u2f_generate_req struct change"

This reverts commit 68fe84a68bfa76f8979caea0f56fd74c38c9981b.

Reason for revert: Causing crbug.com/1111182

Original change's description:
> u2fd: Adjust tests for u2f_generate_req struct change
>
> In preparation for auth-time secrets validation, the struct
> u2f_generate_req now takes an authTimeSecretHash parameter.
> Adjust the expected regex patterns so that tests are valid.
>
> BUG=b:144861739
> TEST=FEATURES=test emerge-nami u2fd
>
> Cq-Depend: chromium:2317047
> Change-Id: I877742e57f77f9a83fcbe313f23bd336fb9cc1f0
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2321731
> Tested-by: Yicheng Li <yichengli@chromium.org>
> Reviewed-by: Andrey Pronin <apronin@chromium.org>
> Commit-Queue: Yicheng Li <yichengli@chromium.org>

Bug: b:144861739
Cq-Depend: chromium:2327358
Exempt-From-Owner-Approval: Causing crbug.com/1111182
Change-Id: I45e8305812fb310968c5e29d3900e43734f3b446
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2327779
Tested-by: Archie Pusaka <apusaka@chromium.org>
Reviewed-by: Yicheng Li <yichengli@chromium.org>
Reviewed-by: Archie Pusaka <apusaka@chromium.org>
Commit-Queue: Archie Pusaka <apusaka@chromium.org>

u2fd/u2f_msg_handler_test.cc

diff --git a/u2fd/u2f_msg_handler_test.cc b/u2fd/u2f_msg_handler_test.cc
index 7f6d432..e617b2b 100644
--- a/u2fd/u2f_msg_handler_test.cc
+++ b/u2fd/u2f_msg_handler_test.cc
@@ -206,10 +206,9 @@
 
   // See U2F_GENERATE_REQ in //platform/ec/include/u2f.h
   std::string expected_cr50_request_regex =
-      "(AA){32}"   // AppId
-      "(EE){32}"   // User Secret
-      "03"         // U2F_AUTH_ENFORCE
-      "(00){32}";  // Auth-time secret hash (unused)
+      "(AA){32}"  // AppId
+      "(EE){32}"  // User Secret
+      "03";       // U2F_AUTH_ENFORCE
 
   struct u2f_generate_resp cr50_response = {
       .keyHandle = {.origin_seed = {[0 ... 31] = 0xFD},
@@ -309,10 +308,9 @@
 
 // See U2F_GENERATE_REQ in //platform/ec/include/u2f.h
 constexpr char kCr50ExpectedGenReqRegex[] =
-    "(AA){32}"   // AppId
-    "(EE){32}"   // User Secret
-    "03"         // U2F_AUTH_ENFORCE | G2F_ATTEST
-    "(00){32}";  // Auth-time secret hash (unused)
+    "(AA){32}"  // AppId
+    "(EE){32}"  // User Secret
+    "03";       // U2F_AUTH_ENFORCE | G2F_ATTEST
 
 // Dummy generate response.
 constexpr struct u2f_generate_resp kCr50GenResp = {

u2fd/webauthn_handler_test.cc

diff --git a/u2fd/webauthn_handler_test.cc b/u2fd/webauthn_handler_test.cc
index c070a55..a83de43 100644
--- a/u2fd/webauthn_handler_test.cc
+++ b/u2fd/webauthn_handler_test.cc
@@ -52,8 +52,7 @@
   static const std::string request_regex =
       base::HexEncode(kRpIdHash.data(), kRpIdHash.size()) +  // AppId
       std::string("(EE){32}") +                              // User Secret
-      std::string("03") +                                    // U2F_AUTH_ENFORCE
-      std::string("(00){32}");  // Auth time secret hash
+      std::string("03");                                     // U2F_AUTH_ENFORCE
   return request_regex;
 }