summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2020-08-11 10:29:02 +1000
committerPauli <paul.dale@oracle.com>2020-08-14 18:15:12 +1000
commitb7466c1303b2e16815092ae4ef6c97ae1f0f347d (patch)
treea2faf89d6620fe6274bb6d02b854efcd8fde0b12 /include
parentc19e6da9a345b1e14caca23c50a0c7690309e0e4 (diff)
Move PKCS#12 KDF to provider.
This KDF is defined in RFC7292 in appendix B. It is widely used in PKCS#12 and should be provided. Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/12624)
Diffstat (limited to 'include')
-rw-r--r--include/openssl/core_names.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/openssl/core_names.h b/include/openssl/core_names.h
index 53e68e778b..97c4d65949 100644
--- a/include/openssl/core_names.h
+++ b/include/openssl/core_names.h
@@ -178,6 +178,7 @@ extern "C" {
#define OSSL_KDF_PARAM_SIZE "size" /* size_t */
#define OSSL_KDF_PARAM_CIPHER OSSL_ALG_PARAM_CIPHER /* utf8 string */
#define OSSL_KDF_PARAM_CONSTANT "constant" /* octet string */
+#define OSSL_KDF_PARAM_PKCS12_ID "id" /* int */
/* Known KDF names */
#define OSSL_KDF_NAME_HKDF "HKDF"