| commit | 1c845757f2196d18ab2ed67d93de94390e43c69a | [log] [tgz] |
|---|---|---|
| author | Eran Messeri <eranm@google.com> | Thu Aug 06 08:23:21 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 06 08:23:21 2020 +0000 |
| tree | ec3922bbc6c63ed62d487da1a06dec74a87dbfaa | |
| parent | 62576bd239eb58c5561949e83cde18409cad2e0e [diff] | |
| parent | 51914eb0eb6cdf0c197f141fe1be6a1f7c931c14 [diff] |
Merge "Fix Keymaster VTS unique attestation failure" am: 3e4d8d0856 am: b0f932739a am: 6a1198e166 am: 51914eb0eb Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12306609 Change-Id: Ifd50b6e0e7bc115bee6d910b732d617c12e87cf1
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) {