diff options
| author | Antoine Salon <asalon@vmware.com> | 2018-10-01 14:11:57 -0700 |
|---|---|---|
| committer | Nicola Tuveri <nic.tuv@gmail.com> | 2018-10-17 13:31:59 +0300 |
| commit | 871039698042467b814b4fa37353db120be5b331 (patch) | |
| tree | 362755099865add0a85143b96fe9a4f5d95c9fc6 /include | |
| parent | 135e8062369f3c7a2398ac12e7eea3c3c18b017d (diff) | |
EVP module documentation pass
Replace ECDH_KDF_X9_62() with internal ecdh_KDF_X9_63()
Signed-off-by: Antoine Salon <asalon@vmware.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/7345)
(cherry picked from commit ffd89124bdfc9e69349492c3f15383bb35520a11)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/ec.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/include/openssl/ec.h b/include/openssl/ec.h index 4d70da70a6..347cfb6d09 100644 --- a/include/openssl/ec.h +++ b/include/openssl/ec.h @@ -1107,6 +1107,11 @@ const EC_KEY_METHOD *EC_KEY_get_method(const EC_KEY *key); int EC_KEY_set_method(EC_KEY *key, const EC_KEY_METHOD *meth); EC_KEY *EC_KEY_new_method(ENGINE *engine); +/** The old name for ecdh_KDF_X9_63 + * The ECDH KDF specification has been mistakingly attributed to ANSI X9.62, + * it is actually specified in ANSI X9.63. + * This identifier is retained for backwards compatibility + */ int ECDH_KDF_X9_62(unsigned char *out, size_t outlen, const unsigned char *Z, size_t Zlen, const unsigned char *sinfo, size_t sinfolen, @@ -1457,7 +1462,13 @@ void EC_KEY_METHOD_get_verify(const EC_KEY_METHOD *meth, # define EVP_PKEY_CTRL_GET1_ID_LEN (EVP_PKEY_ALG_CTRL + 13) /* KDF types */ # define EVP_PKEY_ECDH_KDF_NONE 1 -# define EVP_PKEY_ECDH_KDF_X9_62 2 +# define EVP_PKEY_ECDH_KDF_X9_63 2 +/** The old name for EVP_PKEY_ECDH_KDF_X9_63 + * The ECDH KDF specification has been mistakingly attributed to ANSI X9.62, + * it is actually specified in ANSI X9.63. + * This identifier is retained for backwards compatibility + */ +# define EVP_PKEY_ECDH_KDF_X9_62 EVP_PKEY_ECDH_KDF_X9_63 # ifdef __cplusplus |