From d810cc197737cc34fac60eee04720ad3fb0088bf Mon Sep 17 00:00:00 2001 From: Pauli Date: Mon, 9 Sep 2019 11:35:25 +1000 Subject: [PATCH] Add macros for the KDF algorithm names. This avoids the problems with PBKDF2 and SCRYPT not being of the same form as the rest. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/9814) --- include/openssl/core_names.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/openssl/core_names.h b/include/openssl/core_names.h index 27b4588ce1..b11bc614a8 100644 --- a/include/openssl/core_names.h +++ b/include/openssl/core_names.h @@ -128,6 +128,16 @@ extern "C" { #define OSSL_KDF_PARAM_SSHKDF_TYPE "type" /* int */ #define OSSL_KDF_PARAM_SIZE "size" /* size_t */ +/* Known KDF names */ +#define OSSL_KDF_NAME_HKDF "HKDF" +#define OSSL_KDF_NAME_PBKDF2 "PBKDF2" +#define OSSL_KDF_NAME_SCRYPT "id-scrypt" +#define OSSL_KDF_NAME_SSHKDF "SSHKDF" +#define OSSL_KDF_NAME_SSKDF "SSKDF" +#define OSSL_KDF_NAME_TLS1_PRF "TLS1-PRF" +#define OSSL_KDF_NAME_X942KDF "X942KDF" +#define OSSL_KDF_NAME_X963KDF "X963KDF" + /* PKEY parameters */ /* Diffie-Hellman/DSA Parameters */ #define OSSL_PKEY_PARAM_FFC_P "p" -- 2.25.1