diff options
| author | Matt Caswell <matt@openssl.org> | 2020-10-16 17:35:44 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-11-18 15:14:52 +0100 |
| commit | 13c453728c076d5c1a65a5fd9424e15a9964d755 (patch) | |
| tree | 2adfcc10718f85bab39f1ffcbdb5dff63efe6b69 /apps | |
| parent | Implement a replacement for SSL_set_tmp_dh() (diff) | |
| download | openssl-13c453728c076d5c1a65a5fd9424e15a9964d755.tar.xz openssl-13c453728c076d5c1a65a5fd9424e15a9964d755.zip | |
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 'apps')
| -rw-r--r-- | apps/s_server.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index 839d9320ff..1e4bb4f639 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -980,9 +980,7 @@ const OPTIONS s_server_options[] = { {"use_srtp", OPT_SRTP_PROFILES, 's', "Offer SRTP key management with a colon-separated profile list"}, #endif -#ifndef OPENSSL_NO_DH {"no_dhe", OPT_NO_DHE, '-', "Disable ephemeral DH"}, -#endif #ifndef OPENSSL_NO_NEXTPROTONEG {"nextprotoneg", OPT_NEXTPROTONEG, 's', "Set the advertised protocols for the NPN extension (comma-separated list)"}, @@ -1028,10 +1026,8 @@ int s_server_main(int argc, char *argv[]) #endif do_server_cb server_cb; int vpmtouched = 0, build_chain = 0, no_cache = 0, ext_cache = 0; -#ifndef OPENSSL_NO_DH char *dhfile = NULL; int no_dhe = 0; -#endif int nocert = 0, ret = 1; int noCApath = 0, noCAfile = 0, noCAstore = 0; int s_cert_format = FORMAT_PEM, s_key_format = FORMAT_PEM; @@ -1440,9 +1436,7 @@ int s_server_main(int argc, char *argv[]) s_quiet = s_brief = verify_args.quiet = 1; break; case OPT_NO_DHE: -#ifndef OPENSSL_NO_DH no_dhe = 1; -#endif break; case OPT_NO_RESUME_EPHEMERAL: no_resume_ephemeral = 1; |