Merge "Fixed unchecked key blob access in attestKey"

am: 4e3f697233

Change-Id: If4a382525807b5d7663682f1a927b0d9c2607441
This commit is contained in:
Janis Danisevskis 2019-07-31 12:32:36 -07:00 committed by android-build-merger
commit 4eea9764a4

View file

@ -1039,6 +1039,10 @@ Status KeyStoreService::attestKey(
std::tie(rc, keyBlob, charBlob, lockedEntry) =
mKeyStore->getKeyForName(name8, callingUid, TYPE_KEYMASTER_10);
if (!rc.isOk()) {
return AIDL_RETURN(rc);
}
auto dev = mKeyStore->getDevice(keyBlob);
auto hidlKey = blob2hidlVec(keyBlob);
dev->attestKey(