summaryrefslogtreecommitdiffstats
path: root/providers/defltprov.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2020-07-20 18:06:55 +0100
committerMatt Caswell <matt@openssl.org>2020-08-10 14:51:59 +0100
commit05d2f72e79cdb1736681726dcd9a325491acf002 (patch)
tree865ff2e2e1b9c3e3824a2dd13de6dd62c865d11c /providers/defltprov.c
parentac2d58c72b4dc4a8c74eef893000306bf78a30fd (diff)
Extend the EVP_PKEY KDF to KDF provider bridge to also support HKDF
Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/12573)
Diffstat (limited to 'providers/defltprov.c')
-rw-r--r--providers/defltprov.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/providers/defltprov.c b/providers/defltprov.c
index 5b6d6a677e..f2fe98fc7f 100644
--- a/providers/defltprov.c
+++ b/providers/defltprov.c
@@ -339,7 +339,8 @@ static const OSSL_ALGORITHM deflt_keyexch[] = {
{ "X25519", "provider=default", x25519_keyexch_functions },
{ "X448", "provider=default", x448_keyexch_functions },
#endif
- { "TLS1-PRF", "provider=default", kdf_keyexch_functions },
+ { "TLS1-PRF", "provider=default", kdf_tls1_prf_keyexch_functions },
+ { "HKDF", "provider=default", kdf_hkdf_keyexch_functions },
{ NULL, NULL, NULL }
};
@@ -386,6 +387,7 @@ static const OSSL_ALGORITHM deflt_keymgmt[] = {
{ "ED448", "provider=default", ed448_keymgmt_functions },
#endif
{ "TLS1-PRF", "provider=default", kdf_keymgmt_functions },
+ { "HKDF", "provider=default", kdf_keymgmt_functions },
{ NULL, NULL, NULL }
};