commit b461849e98112f3919b9c2ac5a8af8801ffc097d
author Eran Messeri <eranm@google.com> Thu Aug 06 08:33:17 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 06 08:33:17 2020 +0000
tree 2617b16063a8f543471a462447934825ad91fbe8
parent cb07b80c3c42db10520208ba54410e2bce1a6379
parent 1c845757f2196d18ab2ed67d93de94390e43c69a

Merge "Fix Keymaster VTS unique attestation failure" am: 3e4d8d0856 am: b0f932739a am: 6a1198e166 am: 51914eb0eb am: 1c845757f2

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12306609

Change-Id: I1068380ad614e7e68aff51d2eec23425089878e3

keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp

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) {