summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2019-09-09 03:35:25 +0200
committerPauli <paul.dale@oracle.com>2019-09-11 02:22:49 +0200
commitd810cc197737cc34fac60eee04720ad3fb0088bf (patch)
tree47da8fbebb9cddf542d6c93409c005e8a18c4267 /include
parentCoverity 1453629 and 1453638: Error handling issues (NEGATIVE_RETURNS) (diff)
downloadopenssl-d810cc197737cc34fac60eee04720ad3fb0088bf.tar.xz
openssl-d810cc197737cc34fac60eee04720ad3fb0088bf.zip
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 <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9814)
Diffstat (limited to 'include')
-rw-r--r--include/openssl/core_names.h10
1 files changed, 10 insertions, 0 deletions
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"