diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-03-10 19:09:27 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@akamai.com> | 2015-03-11 09:29:37 -0400 |
| commit | 10bf4fc2c3da332a54247da1f3c0dcb44944f7ff (patch) | |
| tree | c2f597e901f98829266ec4045492195cefdd958c /apps/s_server.c | |
| parent | ac5a110621ca48f0bebd5b4d76d081de403da29e (diff) | |
Merge OPENSSL_NO_EC{DH,DSA} into OPENSSL_NO_EC
Suggested by John Foley <foleyj@cisco.com>.
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'apps/s_server.c')
| -rw-r--r-- | apps/s_server.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index 42088d0e84..874b402aac 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -486,7 +486,7 @@ static void sv_usage(void) " -dhparam arg - DH parameter file to use, in cert file if not specified\n"); BIO_printf(bio_err, " or a default set of parameters is used\n"); -#ifndef OPENSSL_NO_ECDH +#ifndef OPENSSL_NO_EC BIO_printf(bio_err, " -named_curve arg - Elliptic curve name to use for ephemeral ECDH keys.\n" " Use \"openssl ecparam -list_curves\" for all names\n" @@ -545,7 +545,7 @@ static void sv_usage(void) #ifndef OPENSSL_NO_DH BIO_printf(bio_err, " -no_dhe - Disable ephemeral DH\n"); #endif -#ifndef OPENSSL_NO_ECDH +#ifndef OPENSSL_NO_EC BIO_printf(bio_err, " -no_ecdhe - Disable ephemeral ECDH\n"); #endif BIO_printf(bio_err, @@ -1677,7 +1677,7 @@ int MAIN(int argc, char *argv[]) bio_s_out = BIO_new_fp(stdout, BIO_NOCLOSE); } } -#if !defined(OPENSSL_NO_RSA) || !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_ECDSA) +#if !defined(OPENSSL_NO_RSA) || !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_EC) if (nocert) #endif { |