diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2014-10-29 12:51:31 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-11-19 18:11:37 +0000 |
| commit | 3881d8106df732fc433d30446625dfa2396da42d (patch) | |
| tree | ef0762642716406b391256ae647bd1259f204b78 /apps/s_client.c | |
| parent | 5a3d8eebb7667b32af0ccc3f12f314df6809d32d (diff) | |
| download | openssl-3881d8106df732fc433d30446625dfa2396da42d.zip openssl-3881d8106df732fc433d30446625dfa2396da42d.tar.gz openssl-3881d8106df732fc433d30446625dfa2396da42d.tar.bz2 | |
New option no-ssl3-method which removes SSLv3_*method
When no-ssl3 is set only make SSLv3 disabled by default. Retain -ssl3
options for s_client/s_server/ssltest.
When no-ssl3-method is set SSLv3_*method() is removed and all -ssl3
options.
We should document this somewhere, e.g. wiki, FAQ or manual page.
Reviewed-by: Emilia Käsper <emilia@openssl.org>
Diffstat (limited to 'apps/s_client.c')
| -rw-r--r-- | apps/s_client.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index a6f972a..e4281c6 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -336,7 +336,9 @@ static void sc_usage(void) BIO_printf(bio_err," -srp_strength int - minimal mength in bits for N (default %d).\n",SRP_MINIMAL_N); #endif BIO_printf(bio_err," -ssl2 - just use SSLv2\n"); +#ifndef OPENSSL_NO_SSL3_METHOD BIO_printf(bio_err," -ssl3 - just use SSLv3\n"); +#endif BIO_printf(bio_err," -tls1_2 - just use TLSv1.2\n"); BIO_printf(bio_err," -tls1_1 - just use TLSv1.1\n"); BIO_printf(bio_err," -tls1 - just use TLSv1\n"); @@ -914,7 +916,7 @@ static char *jpake_secret = NULL; else if (strcmp(*argv,"-ssl2") == 0) meth=SSLv2_client_method(); #endif -#ifndef OPENSSL_NO_SSL3 +#ifndef OPENSSL_NO_SSL3_METHOD else if (strcmp(*argv,"-ssl3") == 0) meth=SSLv3_client_method(); #endif |