From 3f6ab601b9d175f59e1fb0007005582ae499aba5 Mon Sep 17 00:00:00 2001
From: David Drysdale <drysdale@google.com>
Date: Thu, 6 Jul 2023 10:05:12 +0100
Subject: [PATCH] Allow extra ID attestation error codes

When deliberately testing invalid ID attestation, use the helper
function (which checks the error return code is correct) in one more
place.

Test: VtsAidlKeyMintTargetTest
Bug: 286733800
Change-Id: I6ea5bd7ee19b3b172330117bfde1b16745debba7
(cherry-picked from commit c68dc937884dcab9c67945c12131d8170e7c3c75)
Merged-In: I6ea5bd7ee19b3b172330117bfde1b16745debba7
---
 security/keymint/aidl/vts/functional/KeyMintTest.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/security/keymint/aidl/vts/functional/KeyMintTest.cpp b/security/keymint/aidl/vts/functional/KeyMintTest.cpp
index 4e746b2bb9..18d49e9010 100644
--- a/security/keymint/aidl/vts/functional/KeyMintTest.cpp
+++ b/security/keymint/aidl/vts/functional/KeyMintTest.cpp
@@ -1938,7 +1938,8 @@ TEST_P(NewKeyGenerationTest, EcdsaAttestationTags) {
                         builder, &key_blob, &key_characteristics);
             }
         }
-        ASSERT_EQ(error, ErrorCode::CANNOT_ATTEST_IDS);
+
+        device_id_attestation_check_acceptable_error(tag.tag, error);
     }
 }