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/s3_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/s3_lib.c')
| -rw-r--r-- | ssl/s3_lib.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 8a572b8dd3..d67aa31d46 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -3451,8 +3451,7 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) case SSL_CTRL_GET_FLAGS: ret = (int)(s->s3.flags); break; -#ifndef OPENSSL_NO_DH -# ifndef OPENSSL_NO_DEPRECATED_3_0 +#if !defined(OPENSSL_NO_DH) && !defined(OPENSSL_NO_DEPRECATED_3_0) case SSL_CTRL_SET_TMP_DH: { EVP_PKEY *pkdh = NULL; @@ -3477,7 +3476,6 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) case SSL_CTRL_SET_DH_AUTO: s->cert->dh_tmp_auto = larg; return 1; -#endif #ifndef OPENSSL_NO_EC case SSL_CTRL_SET_TMP_ECDH: { |