commit 38fe3c5962a451cfc552f0a23572b10c147ca0df
author David Drysdale <drysdale@google.com> Mon Aug 09 05:54:56 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 09 05:54:56 2021 +0000
tree 76808ee2ea38d3365a78118973efb68202edfa5f
parent e0b2d17cbfe14e14c4cde6d48522bca48441e0ca
parent a038695b218b3610236d3378015bc812cf26cb42

Merge "KeyMint VTS: catch empty cert chains"

keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp

diff --git a/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp b/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp
index 01c502c..476eed8 100644
--- a/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp
+++ b/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp
@@ -438,7 +438,7 @@
     // TODO(b/136282179): When running under VTS-on-GSI the TEE-backed
     // keymaster implementation will report YYYYMM dates instead of YYYYMMDD
     // for the BOOT_PATCH_LEVEL.
-    if (avb_verification_enabled()) {
+    if (!is_gsi()) {
         for (int i = 0; i < att_hw_enforced.size(); i++) {
             if (att_hw_enforced[i].tag == TAG_BOOT_PATCHLEVEL ||
                 att_hw_enforced[i].tag == TAG_VENDOR_PATCHLEVEL) {