diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-03-11 00:09:27 +0100 |
|---|---|---|
| committer | Rich Salz <rsalz@akamai.com> | 2015-03-11 14:29:37 +0100 |
| commit | 10bf4fc2c3da332a54247da1f3c0dcb44944f7ff (patch) | |
| tree | c2f597e901f98829266ec4045492195cefdd958c /ssl/ssltest.c | |
| parent | Fix seg fault in ASN1_generate_v3/ASN1_generate_nconf (diff) | |
| download | openssl-10bf4fc2c3da332a54247da1f3c0dcb44944f7ff.tar.xz openssl-10bf4fc2c3da332a54247da1f3c0dcb44944f7ff.zip | |
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 'ssl/ssltest.c')
| -rw-r--r-- | ssl/ssltest.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ssl/ssltest.c b/ssl/ssltest.c index 89fb44a4ca..7a157a694b 100644 --- a/ssl/ssltest.c +++ b/ssl/ssltest.c @@ -774,7 +774,7 @@ static void sv_usage(void) " -dhe1024dsa - use 1024 bit key (with 160-bit subprime) for DHE\n"); fprintf(stderr, " -no_dhe - disable DHE\n"); #endif -#ifndef OPENSSL_NO_ECDH +#ifndef OPENSSL_NO_EC fprintf(stderr, " -no_ecdhe - disable ECDHE\n"); #endif #ifndef OPENSSL_NO_PSK @@ -803,7 +803,7 @@ static void sv_usage(void) " -time - measure processor time used by client and server\n"); fprintf(stderr, " -zlib - use zlib compression\n"); fprintf(stderr, " -rle - use rle compression\n"); -#ifndef OPENSSL_NO_ECDH +#ifndef OPENSSL_NO_EC fprintf(stderr, " -named_curve arg - Elliptic curve name to use for ephemeral ECDH keys.\n" " Use \"openssl ecparam -list_curves\" for all names\n" @@ -967,7 +967,7 @@ int main(int argc, char *argv[]) char *server_key = NULL; char *client_cert = TEST_CLIENT_CERT; char *client_key = NULL; -#ifndef OPENSSL_NO_ECDH +#ifndef OPENSSL_NO_EC char *named_curve = NULL; #endif SSL_CTX *s_ctx = NULL; @@ -980,7 +980,7 @@ int main(int argc, char *argv[]) DH *dh; int dhe1024 = 0, dhe1024dsa = 0; #endif -#ifndef OPENSSL_NO_ECDH +#ifndef OPENSSL_NO_EC EC_KEY *ecdh = NULL; #endif #ifndef OPENSSL_NO_SRP @@ -1206,7 +1206,7 @@ int main(int argc, char *argv[]) else if (strcmp(*argv, "-named_curve") == 0) { if (--argc < 1) goto bad; -#ifndef OPENSSL_NO_ECDH +#ifndef OPENSSL_NO_EC named_curve = *(++argv); #else fprintf(stderr, @@ -1470,7 +1470,7 @@ int main(int argc, char *argv[]) (void)no_dhe; #endif -#ifndef OPENSSL_NO_ECDH +#ifndef OPENSSL_NO_EC if (!no_ecdhe) { int nid; |