diff options
| author | Mao Li <maol@codeaurora.org> | 2015-12-01 01:46:19 +0800 |
|---|---|---|
| committer | zhouxin96 <i@zhouxin96.cn> | 2016-08-19 13:16:44 +0800 |
| commit | dc06a0f1f26ff5431d13c544b0603c32d97ba2e9 (patch) | |
| tree | c4fbdd4db5baaff0b2e413e41d13d52ab52a0ffb | |
| parent | 057d9700782c5b3dc27370b8afba1437cece608f (diff) | |
| download | android_system_keymaster-dc06a0f1f26ff5431d13c544b0603c32d97ba2e9.tar.gz android_system_keymaster-dc06a0f1f26ff5431d13c544b0603c32d97ba2e9.tar.bz2 android_system_keymaster-dc06a0f1f26ff5431d13c544b0603c32d97ba2e9.zip | |
keymaster: Add SOTER supportHEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001cm-13.0
Ignore SOTER TAGs in AuthorizeBegin to avoid compiling errors.
Change-Id: I8d4fe352ae277af4dc6bacf4f39e6e0102328d6e
| -rw-r--r-- | keymaster_enforcement.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
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; } } |