diff options
| author | Pauli <paul.dale@oracle.com> | 2020-02-03 19:05:31 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-02-20 19:04:57 +1000 |
| commit | ada66e78ef535fe80e422bbbadffe8e7863d457c (patch) | |
| tree | c9caa2b3cd516d99937b02d50e16fc0dda1509b8 /ssl/s3_lib.c | |
| parent | 0ad05b190ebb3a62f8519c8c4c721304c2405849 (diff) | |
Deprecate the low level Diffie-Hellman functions.
Use of the low level DH functions has been informally discouraged for a
long time. We now formally deprecate them.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11024)
Diffstat (limited to 'ssl/s3_lib.c')
| -rw-r--r-- | ssl/s3_lib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 706290be9b..51f8a0f63d 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -4752,7 +4752,7 @@ EVP_PKEY *ssl_generate_pkey_group(SSL *s, uint16_t id) || (dh = DH_new_by_nid(ginf->nid)) == NULL || !EVP_PKEY_assign(pkey, EVP_PKEY_DH, dh)) { SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL_GENERATE_PKEY_GROUP, - ERR_R_EVP_LIB); + ERR_R_EVP_LIB); DH_free(dh); EVP_PKEY_free(pkey); pkey = NULL; @@ -4760,7 +4760,7 @@ EVP_PKEY *ssl_generate_pkey_group(SSL *s, uint16_t id) } if (EVP_PKEY_CTX_set_dh_nid(pctx, ginf->nid) <= 0) { SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL_GENERATE_PKEY_GROUP, - ERR_R_EVP_LIB); + ERR_R_EVP_LIB); EVP_PKEY_free(pkey); pkey = NULL; goto err; @@ -4796,7 +4796,7 @@ EVP_PKEY *ssl_generate_pkey_group(SSL *s, uint16_t id) /* * Generate parameters from a group ID */ -EVP_PKEY *ssl_generate_param_group(uint16_t id) +EVP_PKEY *ssl_generate_param_group(SSL *s, uint16_t id) { EVP_PKEY_CTX *pctx = NULL; EVP_PKEY *pkey = NULL; |