diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-12-02 18:27:03 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-12-16 11:56:38 +0100 |
| commit | c2403f362efc519e473269d183adc7cceddb8c54 (patch) | |
| tree | 356a5fce1a987659345a60cf0abb30d8412b73e2 /apps | |
| parent | 565b33990cc03d757f493616c040addbedfc80f8 (diff) | |
Drop unnecessary checks of OPENSSL_NO_DH, OPENSSL_NO_DSA and OPENSSL_NO_EC
The apps, the CMS library and the X.509 library are primarly affected.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13589)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/s_server.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index 55a300beac..94417a206b 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -1252,9 +1252,7 @@ int s_server_main(int argc, char *argv[]) s_chain_file = opt_arg(); break; case OPT_DHPARAM: -#ifndef OPENSSL_NO_DH dhfile = opt_arg(); -#endif break; case OPT_DCERTFORM: if (!opt_format(opt_arg(), OPT_FMT_ANY, &s_dcert_format)) @@ -1826,10 +1824,7 @@ int s_server_main(int argc, char *argv[]) bio_s_out = dup_bio_out(FORMAT_TEXT); } } -#if !defined(OPENSSL_NO_RSA) || !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_EC) - if (nocert) -#endif - { + if (nocert) { s_cert_file = NULL; s_key_file = NULL; s_dcert_file = NULL; |