diff options
| author | David Drysdale <drysdale@google.com> | 2021-04-27 16:43:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-04-27 16:43:01 +0000 |
| commit | 5cde787c9f720d702a8c1c65f5468a1c7401337f (patch) | |
| tree | 3fba8641d5a3c26591029229a65022b8419a23e4 /security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp | |
| parent | 2fff1705623c2af5c7f2c38cd511c32abf9a6afb (diff) | |
| parent | 56ba912b30e91a2c20174f693c4e2b0d634cfb90 (diff) | |
Merge "Align KeyMint AIDL with usage"
Diffstat (limited to 'security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp')
| -rw-r--r-- | security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp index 6202a8ba97..8c3777f8c5 100644 --- a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp +++ b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp @@ -119,7 +119,6 @@ char nibble2hex[16] = {'0', '1', '2', '3', '4', '5', '6', '7', // Attestations don't contain everything in key authorization lists, so we need to filter the key // lists to produce the lists that we expect to match the attestations. auto kTagsToFilter = { - Tag::BLOB_USAGE_REQUIREMENTS, // Tag::CREATION_DATETIME, // Tag::EC_CURVE, Tag::HARDWARE_TYPE, @@ -348,7 +347,7 @@ ErrorCode KeyMintAidlTestBase::Begin(KeyPurpose purpose, const vector<uint8_t>& SCOPED_TRACE("Begin"); Status result; BeginResult out; - result = keymint_->begin(purpose, key_blob, in_params.vector_data(), HardwareAuthToken(), &out); + result = keymint_->begin(purpose, key_blob, in_params.vector_data(), std::nullopt, &out); if (result.isOk()) { *out_params = out.params; @@ -366,7 +365,7 @@ ErrorCode KeyMintAidlTestBase::Begin(KeyPurpose purpose, const vector<uint8_t>& Status result; BeginResult out; - result = keymint_->begin(purpose, key_blob, in_params.vector_data(), HardwareAuthToken(), &out); + result = keymint_->begin(purpose, key_blob, in_params.vector_data(), std::nullopt, &out); if (result.isOk()) { *out_params = out.params; |