commit 96c1c49608486cb30c3915c1a456a5330e95ba4e
author Mao Li <maol@codeaurora.org> Tue Dec 01 01:46:19 2015 +0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Jan 24 02:46:36 2016 -0800
tree c4fbdd4db5baaff0b2e413e41d13d52ab52a0ffb
parent a9ace4c031beb088033b2e43491d99b0062680fe

keymaster: Add SOTER support

Ignore SOTER TAGs in AuthorizeBegin to avoid compiling errors.

Change-Id: I8d4fe352ae277af4dc6bacf4f39e6e0102328d6e

keymaster_enforcement.cpp

diff --git a/keymaster_enforcement.cpp b/keymaster_enforcement.cpp
index 4d0aaef..b3f9a10 100644
--- a/keymaster_enforcement.cpp
+++ b/keymaster_enforcement.cpp
@@ -325,6 +325,18 @@
 
         case KM_TAG_BOOTLOADER_ONLY:
             return KM_ERROR_INVALID_KEY_BLOB;
+
+        /* Ignored soter tags */
+        case KM_TAG_SOTER_IS_FROM_SOTER:
+        case KM_TAG_SOTER_IS_AUTO_SIGNED_WITH_ATTK_WHEN_GET_PUBLIC_KEY:
+        case KM_TAG_SOTER_IS_AUTO_SIGNED_WITH_COMMON_KEY_WHEN_GET_PUBLIC_KEY:
+        case KM_TAG_SOTER_AUTO_SIGNED_COMMON_KEY_WHEN_GET_PUBLIC_KEY:
+        case KM_TAG_SOTER_AUTO_ADD_COUNTER_WHEN_GET_PUBLIC_KEY:
+        case KM_TAG_SOTER_IS_SECMSG_FID_COUNTER_SIGNED_WHEN_SIGN:
+        case KM_TAG_SOTER_USE_NEXT_ATTK:
+        case KM_TAG_SOTER_UID:
+        case KM_TAG_SOTER_AUTO_SIGNED_COMMON_KEY_WHEN_GET_PUBLIC_KEY_BLOB:
+            break;
         }
     }