Fix temporary key deletion after device ID attestation
After device ID attestation has been performed, the key used for it
should be deleted. Calling directly into the keymaster HAL for this
is wrong as it removes the key from keymaster but still leaves the
actual key matter around and the alias visible to KeyStore.
The key should be deleted using the KeyStore's delete method.
Bug: 37522655
Test: GTS DeviceIdAttestationHostTest
Change-Id: I10b27216642893d2a1cf8407f65eb4207bcde1f5
diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index a28a35a..a8b635e 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -1392,7 +1392,7 @@
if (attestingDeviceIds) {
// When performing device id attestation, treat the key as ephemeral and delete it straight
// away.
- deletionRc = KS_HANDLE_HIDL_ERROR(dev->deleteKey(hidlKey));
+ deletionRc = del(name, callingUid);
}
if (!attestationRc.isOk()) {