commit ec35536ef9f3a1929cbe0efd15bec49a0a659b64
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jan 23 19:47:31 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 23 19:47:31 2018 +0000
tree 522199c960adba312a631fb4c2419f3ae9100ce0
parent 0a198a0412d45b394d803d60b906b0c72aca8d2d
parent 30adb4986b4dec154552815d0e99c9fd5a946a36

Merge "Add support for BOOT and VENDOR patch levels to keymaster."

keystore/keymaster_enforcement.cpp

diff --git a/keystore/keymaster_enforcement.cpp b/keystore/keymaster_enforcement.cpp
index c6d9a55..30e97f4 100644
--- a/keystore/keymaster_enforcement.cpp
+++ b/keystore/keymaster_enforcement.cpp
@@ -335,9 +335,11 @@
 
         /* Tags that are implicitly verified by secure side */
         case Tag::APPLICATION_ID:
-        case Tag::OS_VERSION:
+        case Tag::BOOT_PATCHLEVEL:
         case Tag::OS_PATCHLEVEL:
+        case Tag::OS_VERSION:
         case Tag::TRUSTED_USER_PRESENCE_REQUIRED:
+        case Tag::VENDOR_PATCHLEVEL:
 
         /* TODO(swillden): Handle these */
         case Tag::INCLUDE_UNIQUE_ID: