commit b243fb5ca3026f3aec7d2e10504e0448922456f9
author Etan Cohen <etancohen@google.com> Thu Jun 08 05:26:13 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 08 05:26:21 2017 +0000
tree dcf637389128d873ad62a51e545b6e35c286914d
parent db5b71c924e8640adaa5e55aa46cd7313ba03c71
parent a7a059ebbf859506509172a30b5ef9b945123617

Merge "[AWARE] Fix validity check on PMK + export PASSPHRASE lengths" into oc-dr1-dev

keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp

diff --git a/keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp b/keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp
index d4360d8..b86d957 100644
--- a/keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp
+++ b/keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp
@@ -967,11 +967,7 @@
                                        &att_tee_enforced,                //
                                        &att_unique_id));
 
-    if (att_keymaster_version == 3) {
-        EXPECT_EQ(2U, att_attestation_version);
-    } else {
-        EXPECT_EQ(1U, att_attestation_version);
-    }
+    EXPECT_TRUE(att_attestation_version == 1 || att_attestation_version == 2);
 
     expected_sw_enforced.push_back(TAG_ATTESTATION_APPLICATION_ID,
                                    HidlBuf(app_id));