commit b9346f5146088ac286b85aee663231fbf7b61bdf
author Eran Messeri <eranm@google.com> Thu Dec 15 14:58:34 2022 +0000
committer Eran Messeri <eranm@google.com> Thu Dec 15 14:59:52 2022 +0000
tree 96647bd4093d33cd49670507aee9edcf73818afc
parent 9dc8e53e7c38951ba290e42d527c8496a350e752

Enforce KeyMint v3 for VSR level 14

Enforce that devices shipped with VSR-14 chipsets have KeyMint 3.

Bug: 251242992
Bug: 251510880
Test: atest VtsAidlKeyMintTargetTest
Change-Id: I21716ce02772266ce414c213a199c838cb2ef28a

security/keymint/aidl/vts/functional/KeyMintTest.cpp

diff --git a/security/keymint/aidl/vts/functional/KeyMintTest.cpp b/security/keymint/aidl/vts/functional/KeyMintTest.cpp
index 5a86283..ca18082 100644
--- a/security/keymint/aidl/vts/functional/KeyMintTest.cpp
+++ b/security/keymint/aidl/vts/functional/KeyMintTest.cpp
@@ -8609,6 +8609,14 @@
     EXPECT_GE(AidlVersion(), 2) << "VSR 13+ requires KeyMint version 2";
 }
 
+TEST_P(VsrRequirementTest, Vsr14Test) {
+    int vsr_api_level = get_vsr_api_level();
+    if (vsr_api_level < 34) {
+        GTEST_SKIP() << "Applies only to VSR API level 34, this device is: " << vsr_api_level;
+    }
+    EXPECT_GE(AidlVersion(), 3) << "VSR 14+ requires KeyMint version 3";
+}
+
 INSTANTIATE_KEYMINT_AIDL_TEST(VsrRequirementTest);
 
 }  // namespace aidl::android::hardware::security::keymint::test