diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-04-15 18:25:17 +1000 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-04-26 19:52:11 +0200 |
| commit | f1ffaaeece5efb7d2f4859a59e3164edf9b4b769 (patch) | |
| tree | a125dfda9f44ef0702f8bae025ccec829eb33652 /include | |
| parent | 6c9bc258d2e9e7b500236a1c696da1f384f0b907 (diff) | |
Fixes related to separation of DH and DHX types
Fix dh_rfc5114 option in genpkey.
Fixes #14145
Fixes #13956
Fixes #13952
Fixes #13871
Fixes #14054
Fixes #14444
Updated documentation for app to indicate what options are available for
DH and DHX keys.
DH and DHX now have different keymanager gen_set_params() methods.
Added CHANGES entry to indicate the breaking change.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14883)
Diffstat (limited to 'include')
| -rw-r--r-- | include/crypto/dh.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/crypto/dh.h b/include/crypto/dh.h index ff7c65a468..8613f9038e 100644 --- a/include/crypto/dh.h +++ b/include/crypto/dh.h @@ -26,7 +26,7 @@ int ossl_dh_generate_public_key(BN_CTX *ctx, const DH *dh, const BIGNUM *priv_key, BIGNUM *pub_key); int ossl_dh_get_named_group_uid_from_size(int pbits); const char *ossl_dh_gen_type_id2name(int id); -int ossl_dh_gen_type_name2id(const char *name); +int ossl_dh_gen_type_name2id(const char *name, int type); void ossl_dh_cache_named_group(DH *dh); int ossl_dh_is_named_safe_prime_group(const DH *dh); |