commit 2f361c15718b660957712c2992653af5751da024
author David Drysdale <drysdale@google.com> Mon Oct 11 12:49:50 2021 +0100
committer David Drysdale <drysdale@google.com> Wed Nov 10 15:02:03 2021 +0000
tree b2f62fe577efbb43b6db12bcc4d4dfedbe7796e7
parent 5ee43a6d246304b53cbf131b9be12907398a4263

KeyMint VTS: check INCLUDE_UNIQUE_ID works

Bug: 202487002
Test: atest VtsAidlKeyMintTargetTest (on CF, O6)
Merged-In: I8bc674b47549aa1133f816c510289774db752e04
Change-Id: I8bc674b47549aa1133f816c510289774db752e04
Ignore-AOSP-First: already in aosp/master

security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp

diff --git a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp
index 2032411..8e35c91 100644
--- a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp
+++ b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp
@@ -1298,7 +1298,8 @@
                                AuthorizationSet expected_sw_enforced,  //
                                AuthorizationSet expected_hw_enforced,  //
                                SecurityLevel security_level,
-                               const vector<uint8_t>& attestation_cert) {
+                               const vector<uint8_t>& attestation_cert,
+                               vector<uint8_t>* unique_id) {
     X509_Ptr cert(parse_cert_blob(attestation_cert));
     EXPECT_TRUE(!!cert.get());
     if (!cert.get()) return false;
@@ -1458,6 +1459,10 @@
     expected_hw_enforced.Sort();
     EXPECT_EQ(filtered_tags(expected_hw_enforced), filtered_tags(att_hw_enforced));
 
+    if (unique_id != nullptr) {
+        *unique_id = att_unique_id;
+    }
+
     return true;
 }