commit b0f932739aa5107ce616981ddb8c573ad6f98dc7
author Eran Messeri <eranm@google.com> Fri Jul 24 13:20:21 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 24 13:20:21 2020 +0000
tree ef6a6d1003d1868b6bda95739089fd6359788507
parent 2b65e3c849033d54f63f79d3637055e8f132518d
parent 3e4d8d085610d95a26c0a153e785e1072f803c43

Merge "Fix Keymaster VTS unique attestation failure" am: 3e4d8d0856

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

Change-Id: Ib0dd1e0498437f11837ccf18b6141d58f7e43850

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 7ea3275..a9a8b1a 100644
--- a/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp
+++ b/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp
@@ -184,9 +184,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) {