commit 30adb4986b4dec154552815d0e99c9fd5a946a36
author Shawn Willden <swillden@google.com> Thu Jan 18 18:48:29 2018 -0700
committer Shawn Willden <swillden@google.com> Fri Jan 19 07:13:44 2018 -0700
tree 7eab9f2bbcc809bc0b8a552c9a34316b09d965c6
parent eedcfe96d1b4517eb5201a8557aedc00d806c88a

Add support for BOOT and VENDOR patch levels to keymaster.

Test: CTS & VTS
Change-Id: Ie6820c55bb364d164dba4fca57154a1e96620dd5

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: