diff options
| author | Bill Yi <byi@google.com> | 2018-10-19 12:20:42 -0700 |
|---|---|---|
| committer | Bill Yi <byi@google.com> | 2018-10-19 12:20:42 -0700 |
| commit | 5989a2f631c237d57dc930be80f45494ccce27e7 (patch) | |
| tree | 8e0194d534f384fda9b6e8fb83788c5b098c4b6c /keymaster/4.0/support/Keymaster.cpp | |
| parent | 7d49f30d3e9688a3fd646c132236bf7322084a67 (diff) | |
| parent | 9232ca3782bf03705e261bf5ba2680dd8c40a84a (diff) | |
Merge pi-dr1-dev to aosp-master
Change-Id: Ida0bc98526f4fc7a1c20f5bbd3210b2f6156d459
Diffstat (limited to 'keymaster/4.0/support/Keymaster.cpp')
| -rw-r--r-- | keymaster/4.0/support/Keymaster.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/keymaster/4.0/support/Keymaster.cpp b/keymaster/4.0/support/Keymaster.cpp index 444298b5bb..9325cc0699 100644 --- a/keymaster/4.0/support/Keymaster.cpp +++ b/keymaster/4.0/support/Keymaster.cpp @@ -164,10 +164,10 @@ static void computeHmac(const Keymaster::KeymasterSet& keymasters, 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(); |