diff options
| author | Shawn Willden <swillden@google.com> | 2015-11-23 14:17:27 +0000 |
|---|---|---|
| committer | Shawn Willden <swillden@google.com> | 2015-11-23 14:17:27 +0000 |
| commit | 1181779c5e6c8627b94067d86db6a2f7d5309674 (patch) | |
| tree | 8500104e3fdf2437c49de2b782ca9a5ca98f18d7 /include | |
| parent | 41998988331ff38e922a59ef008896beb3145ba0 (diff) | |
| download | keymaster-1181779c5e6c8627b94067d86db6a2f7d5309674.tar.gz | |
Revert "ECIES: add ECIES-KEM. This version supports HKDF and ECDH with NIST curves."
This reverts commit 41998988331ff38e922a59ef008896beb3145ba0.
Change-Id: Ifed6b4e5a69310770373a396271f02da5c9d8934
Diffstat (limited to 'include')
| -rw-r--r-- | include/keymaster/ec_key_factory.h | 1 | ||||
| -rw-r--r-- | include/keymaster/keymaster_tags.h | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/keymaster/ec_key_factory.h b/include/keymaster/ec_key_factory.h index 2715e79..2371b7f 100644 --- a/include/keymaster/ec_key_factory.h +++ b/include/keymaster/ec_key_factory.h @@ -53,6 +53,7 @@ class EcKeyFactory : public AsymmetricKeyFactory { OperationFactory* GetOperationFactory(keymaster_purpose_t purpose) const override; static EC_GROUP* choose_group(size_t key_size_bits); + static keymaster_error_t get_group_size(const EC_GROUP& group, size_t* key_size_bits); }; } // namespace keymaster diff --git a/include/keymaster/keymaster_tags.h b/include/keymaster/keymaster_tags.h index 4cd2a6c..21d6966 100644 --- a/include/keymaster/keymaster_tags.h +++ b/include/keymaster/keymaster_tags.h @@ -164,7 +164,6 @@ DEFINE_KEYMASTER_TAG(KM_UINT, TAG_MAC_LENGTH); DEFINE_KEYMASTER_TAG(KM_BOOL, TAG_CALLER_NONCE); DEFINE_KEYMASTER_TAG(KM_UINT, TAG_MIN_MAC_LENGTH); DEFINE_KEYMASTER_TAG(KM_ULONG, TAG_RSA_PUBLIC_EXPONENT); -DEFINE_KEYMASTER_TAG(KM_BOOL, TAG_ECIES_SINGLE_HASH_MODE); DEFINE_KEYMASTER_TAG(KM_DATE, TAG_ACTIVE_DATETIME); DEFINE_KEYMASTER_TAG(KM_DATE, TAG_ORIGINATION_EXPIRE_DATETIME); DEFINE_KEYMASTER_TAG(KM_DATE, TAG_USAGE_EXPIRE_DATETIME); @@ -205,9 +204,6 @@ DEFINE_KEYMASTER_ENUM_TAG(KM_ENUM, TAG_BLOB_USAGE_REQUIREMENTS, keymaster_key_blob_usage_requirements_t); DEFINE_KEYMASTER_ENUM_TAG(KM_ENUM, TAG_ORIGIN, keymaster_key_origin_t); DEFINE_KEYMASTER_ENUM_TAG(KM_ENUM, TAG_USER_AUTH_TYPE, hw_authenticator_type_t); -DEFINE_KEYMASTER_ENUM_TAG(KM_ENUM, TAG_KDF, keymaster_kdf_t); -DEFINE_KEYMASTER_ENUM_TAG(KM_ENUM, TAG_EC_CURVE, keymaster_ec_curve_t); -DEFINE_KEYMASTER_ENUM_TAG(KM_ENUM, TAG_EC_POINT_FORMAT, keymaster_ec_point_format_t); // // Overloaded function "Authorization" to create keymaster_key_param_t objects for all of tags. |