diff options
| author | David Drysdale <drysdale@google.com> | 2021-10-11 12:49:50 +0100 |
|---|---|---|
| committer | David Drysdale <drysdale@google.com> | 2021-10-29 14:39:12 +0100 |
| commit | 565ccc70ed0dd31965ca4ca86ddce1be741da1c5 (patch) | |
| tree | 63ffbdce2aa26c14b3b3155f76fd267e5b5f89e8 /security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp | |
| parent | 236fa8908c60a58fe1bfc4478e7d91a6d0e46f8f (diff) | |
KeyMint VTS: check INCLUDE_UNIQUE_ID works
Bug: 202487002
Test: atest VtsAidlKeyMintTargetTest (on CF, O6)
Change-Id: I8bc674b47549aa1133f816c510289774db752e04
Diffstat (limited to 'security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp')
| -rw-r--r-- | security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp index 37acfa9032..12ce859f29 100644 --- a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp +++ b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp @@ -1307,7 +1307,8 @@ bool verify_attestation_record(const string& challenge, // 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; @@ -1472,6 +1473,10 @@ bool verify_attestation_record(const string& challenge, // 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; } |