From dbffd3d096656f7509245f574f4c17efdae4ab6b Mon Sep 17 00:00:00 2001 From: Shivaprasad Hongal Date: Mon, 23 Jul 2018 12:38:03 -0700 Subject: [PATCH] keymasterV4_0: Tags support for FBE wrapped key. Define two new tags for FBE Key Management. FBE_ICE: This is a boolean which specifies if new key management is used. KEY_TYPE: Specifies if it is a DE_USER or a CE_USER key. CRs-Fixed: 2288316 Change-Id: Id9468d1fab0b0517a0a96734cdfe5612855fd2d9 --- keymaster/4.0/support/include/keymasterV4_0/keymaster_tags.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keymaster/4.0/support/include/keymasterV4_0/keymaster_tags.h b/keymaster/4.0/support/include/keymasterV4_0/keymaster_tags.h index ea40971898..d7358f36f3 100644 --- a/keymaster/4.0/support/include/keymasterV4_0/keymaster_tags.h +++ b/keymaster/4.0/support/include/keymasterV4_0/keymaster_tags.h @@ -73,6 +73,9 @@ namespace V4_0 { static const int32_t KM_TAG_DIGEST_OLD = static_cast(TagType::ENUM) | 5; static const int32_t KM_TAG_PADDING_OLD = static_cast(TagType::ENUM) | 7; +static const int32_t KM_TAG_FBE_ICE = static_cast(TagType::BOOL) | 16201; +static const int32_t KM_TAG_KEY_TYPE = static_cast(TagType::UINT) | 16202; + constexpr TagType typeFromTag(Tag tag) { return static_cast(static_cast(tag) & static_cast(0xf0000000)); }