commit b6093dccf01c6bd5fbcb6123b8930266ea1a3fda
author Janis Danisevskis <jdanis@google.com> Wed Jun 20 22:32:13 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 20 22:32:13 2018 +0000
tree c0399ee4afe13ff417a4e557554c0a20a601e468
parent f053b3de23ed63f1401cb61317d596e9330d35a1
parent a1c4e0ec5deaf3c6c4e8694afd67eb5a24bd0fa5

Merge "Relax HMAC computation check" into pi-dev

keymaster/4.0/support/Keymaster.cpp

diff --git a/keymaster/4.0/support/Keymaster.cpp b/keymaster/4.0/support/Keymaster.cpp
index 444298b..9325cc0 100644
--- a/keymaster/4.0/support/Keymaster.cpp
+++ b/keymaster/4.0/support/Keymaster.cpp
@@ -164,10 +164,10 @@
                     sharingCheck = curSharingCheck;
                     firstKeymaster = false;
                 }
-                CHECK(curSharingCheck == sharingCheck)
-                    << "HMAC computation failed for " << *keymaster  //
-                    << " Expected: " << sharingCheck                 //
-                    << " got: " << curSharingCheck;
+                if (curSharingCheck != sharingCheck)
+                    LOG(WARNING) << "HMAC computation failed for " << *keymaster  //
+                                 << " Expected: " << sharingCheck                 //
+                                 << " got: " << curSharingCheck;
             });
         CHECK(rc.isOk()) << "Failed to communicate with " << *keymaster
                          << " error: " << rc.description();