commit ab976cd8885f9ae4449bee05929283031dc356f5
author Martijn Coenen <maco@google.com> Wed Mar 10 17:15:54 2021 +0100
committer Martijn Coenen <maco@google.com> Wed Mar 10 16:25:49 2021 +0000
tree d458c67d13aca46142dada0e9e996de2109e653d
parent 5142b59e8f2c54c60e137ba6f7c1e4ba94f7b4fe

Make sure MAX_BOOT_LEVEL is returned in KeyCharacteristics.

Bug: 176450483
Test: Verified MAX_BOOT_LEVEL is enforced on KM devices.
Change-Id: I741aac504fc318d2761b7a7de40b5b056f0eba87

keystore2/src/km_compat/km_compat.cpp

diff --git a/keystore2/src/km_compat/km_compat.cpp b/keystore2/src/km_compat/km_compat.cpp
index 5c6e42a..bd9e477 100644
--- a/keystore2/src/km_compat/km_compat.cpp
+++ b/keystore2/src/km_compat/km_compat.cpp
@@ -216,6 +216,8 @@
  */
 bool isNewAndKeystoreEnforceable(const KMV1::KeyParameter& param) {
     switch (param.tag) {
+    case KMV1::Tag::MAX_BOOT_LEVEL:
+        return true;
     case KMV1::Tag::USAGE_COUNT_LIMIT:
         return true;
     default: