From c94d8cbc0d13482dd5996b10eae955df7e1c4740 Mon Sep 17 00:00:00 2001 From: Mao Li Date: Tue, 1 Dec 2015 01:46:19 +0800 Subject: keymaster: Add SOTER support Ignore SOTER TAGs in AuthorizeBegin to avoid compiling errors. RM-290 Change-Id: I8d4fe352ae277af4dc6bacf4f39e6e0102328d6e --- keymaster_enforcement.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 @@ keymaster_error_t KeymasterEnforcement::AuthorizeBegin(const keymaster_purpose_t 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; } } -- cgit v1.2.3