commit | 51914eb0eb6cdf0c197f141fe1be6a1f7c931c14 | [log] [tgz] |
---|---|---|
author | Eran Messeri <eranm@google.com> | Thu Aug 06 08:14:31 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 06 08:14:31 2020 +0000 |
tree | d49b156c3e7bc71a3abad0018f53959b923d7778 | |
parent | 1deae073f4199a1aa760b89ef17a6fc59080a07f [diff] | |
parent | 6a1198e166643800e09e3b8d58cf7fbaa533a33f [diff] |
Merge "Fix Keymaster VTS unique attestation failure" am: 3e4d8d0856 am: b0f932739a am: 6a1198e166 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12306609 Change-Id: Id223b4ec4161f11c92b5dcb36ec417b3af50be89
diff --git a/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp b/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp index 495de0f..728a523 100644 --- a/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp +++ b/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp
@@ -212,9 +212,11 @@ EXPECT_EQ(ErrorCode::UNIMPLEMENTED, convert(AttestKey( AuthorizationSetBuilder() + .Authorization(TAG_DEVICE_UNIQUE_ATTESTATION) .Authorization(TAG_ATTESTATION_CHALLENGE, HidlBuf("challenge")) .Authorization(TAG_ATTESTATION_APPLICATION_ID, HidlBuf("foo")), &cert_chain))); + CheckedDeleteKey(); } TEST_P(DeviceUniqueAttestationTest, Rsa) {