Merge "Relax HMAC computation check" into pi-dev

This commit is contained in:
Janis Danisevskis
2018-06-20 22:32:13 +00:00
committed by Android (Google) Code Review

View File

@@ -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();