| commit | ae5559facafb9b0dfc849f26b232a318ec93dc87 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Apr 13 14:34:28 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 13 14:34:28 2021 +0000 |
| tree | fbb6db34f354bfe54d87cf5c5b48378374283407 | |
| parent | 523354c8902a1ddc2708b9a6fa5940a4e4394315 [diff] | |
| parent | e924c7b6c8cbb8973ed2eca48edaaf4b0b2d7d89 [diff] |
Merge "vts: Correct the TagType when verify_attestation_record" am: d997c72959 am: e924c7b6c8 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1668946 Change-Id: Ia8a1eaebbffdad5fcbf5b16a6040fbb0d1da7fda
diff --git a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp index ec21944..3da0484 100644 --- a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp +++ b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp
@@ -903,7 +903,7 @@ if (att_hw_enforced[i].tag == TAG_BOOT_PATCHLEVEL || att_hw_enforced[i].tag == TAG_VENDOR_PATCHLEVEL) { std::string date = - std::to_string(att_hw_enforced[i].value.get<KeyParameterValue::dateTime>()); + std::to_string(att_hw_enforced[i].value.get<KeyParameterValue::integer>()); // strptime seems to require delimiters, but the tag value will // be YYYYMMDD date.insert(6, "-");