aboutsummaryrefslogtreecommitdiff
path: root/providers/defltprov.c
diff options
context:
space:
mode:
authorShane Lontis <shane.lontis@oracle.com>2020-08-04 11:15:18 +1000
committerShane Lontis <shane.lontis@oracle.com>2020-08-11 20:39:19 +1000
commit627c220311bcd3bd6f4f745b76ce6a548bed4629 (patch)
treee3a1a0a67c9fe71dd1d7eb1aa1646a3ddb41f903 /providers/defltprov.c
parent36b778fbb785ef19dc2476798ccb8233a8a16075 (diff)
downloadopenssl-627c220311bcd3bd6f4f745b76ce6a548bed4629.zip
openssl-627c220311bcd3bd6f4f745b76ce6a548bed4629.tar.gz
openssl-627c220311bcd3bd6f4f745b76ce6a548bed4629.tar.bz2
Add DHX support to keymanager
Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12575)
Diffstat (limited to 'providers/defltprov.c')
-rw-r--r--providers/defltprov.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/providers/defltprov.c b/providers/defltprov.c
index 00d1800..c34c539 100644
--- a/providers/defltprov.c
+++ b/providers/defltprov.c
@@ -374,6 +374,7 @@ static const OSSL_ALGORITHM deflt_asym_cipher[] = {
static const OSSL_ALGORITHM deflt_keymgmt[] = {
#ifndef OPENSSL_NO_DH
{ "DH:dhKeyAgreement", "provider=default", dh_keymgmt_functions },
+ { "DHX:X9.42 DH:dhpublicnumber", "provider=default", dhx_keymgmt_functions },
#endif
#ifndef OPENSSL_NO_DSA
{ "DSA:dsaEncryption", "provider=default", dsa_keymgmt_functions },