diff options
| author | Matt Caswell <matt@openssl.org> | 2020-10-16 16:35:44 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-11-18 14:14:52 +0000 |
| commit | 13c453728c076d5c1a65a5fd9424e15a9964d755 (patch) | |
| tree | 2adfcc10718f85bab39f1ffcbdb5dff63efe6b69 /ssl/ssl_lib.c | |
| parent | 163f6dc1f70f30de46a68137c36e70cae4d95cd8 (diff) | |
Only disabled what we need to in a no-dh build
no-dh disables the low level API for DH. However, since we're now using
the high level EVP API in most places we don't need to disable quite so
much.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13368)
Diffstat (limited to 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 8f6771da3d..bb0eec9b5f 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -3504,11 +3504,11 @@ void ssl_set_masks(SSL *s) if (c == NULL) return; + dh_tmp = (c->dh_tmp != NULL #ifndef OPENSSL_NO_DH - dh_tmp = (c->dh_tmp != NULL || c->dh_tmp_cb != NULL || c->dh_tmp_auto); -#else - dh_tmp = 0; + || c->dh_tmp_cb != NULL #endif + || c->dh_tmp_auto); rsa_enc = pvalid[SSL_PKEY_RSA] & CERT_PKEY_VALID; rsa_sign = pvalid[SSL_PKEY_RSA] & CERT_PKEY_VALID; |