diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-08-04 11:15:18 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-08-11 20:39:19 +1000 |
| commit | 627c220311bcd3bd6f4f745b76ce6a548bed4629 (patch) | |
| tree | e3a1a0a67c9fe71dd1d7eb1aa1646a3ddb41f903 /providers/fips/fipsprov.c | |
| parent | 36b778fbb785ef19dc2476798ccb8233a8a16075 (diff) | |
| download | openssl-new-627c220311bcd3bd6f4f745b76ce6a548bed4629.tar.gz | |
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/fips/fipsprov.c')
| -rw-r--r-- | providers/fips/fipsprov.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c index 4711a99b01..b29cae509c 100644 --- a/providers/fips/fipsprov.c +++ b/providers/fips/fipsprov.c @@ -447,6 +447,7 @@ static const OSSL_ALGORITHM fips_asym_cipher[] = { static const OSSL_ALGORITHM fips_keymgmt[] = { #ifndef OPENSSL_NO_DH { "DH:dhKeyAgreement", FIPS_DEFAULT_PROPERTIES, dh_keymgmt_functions }, + { "DHX:X9.42 DH:dhpublicnumber", FIPS_DEFAULT_PROPERTIES, dhx_keymgmt_functions }, #endif #ifndef OPENSSL_NO_DSA { "DSA", FIPS_DEFAULT_PROPERTIES, dsa_keymgmt_functions }, |