From 6a1198e166643800e09e3b8d58cf7fbaa533a33f Mon Sep 17 00:00:00 2001
From: Eran Messeri <eranm@google.com>
Date: Fri, 24 Jul 2020 13:34:02 +0000
Subject: [PATCH] Merge "Fix Keymaster VTS unique attestation failure" am:
 3e4d8d0856 am: b0f932739a

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

Change-Id: I0e2ee2609c8fcf82ad31d9c97423b9006862cb97
(cherry picked from commit 4e3c9a1d659c86878dbb10d3d1e420718365ab5a)

Bug: 160518399

Exempt-From-Owner-Approval: already approved as aosp/1372156.
Change-Id: I0e2ee2609c8fcf82ad31d9c97423b9006862cb97
---
 keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp b/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp
index 495de0f97d..728a523d65 100644
--- a/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp
+++ b/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp
@@ -212,9 +212,11 @@ TEST_P(DeviceUniqueAttestationTest, NonStrongBoxOnly) {
     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) {