From: Matthieu Crapet <[email protected]> Applies when using no-ssl2 or no-ssl3 switches to Configure. '-ssl2' and '-ssl3' switches are correctly handled in s_client, s_server and s_time, but help message is still mentionning it.
Signed-off-by: Matthieu Crapet <[email protected]> --- apps/s_client.c | 4 ++++ apps/s_server.c | 4 ++++ apps/s_time.c | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/apps/s_client.c b/apps/s_client.c index a6f972a..ffee429 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -335,8 +335,12 @@ static void sc_usage(void) BIO_printf(bio_err," -srp_moregroups - Tolerate other than the known g N values.\n"); BIO_printf(bio_err," -srp_strength int - minimal mength in bits for N (default %d).\n",SRP_MINIMAL_N); #endif +#ifndef OPENSSL_NO_SSL2 BIO_printf(bio_err," -ssl2 - just use SSLv2\n"); +#endif +#ifndef OPENSSL_NO_SSL3 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"); diff --git a/apps/s_server.c b/apps/s_server.c index 1e15281..37bf2a7 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -508,8 +508,12 @@ static void sv_usage(void) BIO_printf(bio_err," -srpvfile file - The verifier file for SRP\n"); BIO_printf(bio_err," -srpuserseed string - A seed string for a default user salt.\n"); #endif +#ifndef OPENSSL_NO_SSL2 BIO_printf(bio_err," -ssl2 - Just talk SSLv2\n"); +#endif +#ifndef OPENSSL_NO_SSL3 BIO_printf(bio_err," -ssl3 - Just talk SSLv3\n"); +#endif BIO_printf(bio_err," -tls1_2 - Just talk TLSv1.2\n"); BIO_printf(bio_err," -tls1_1 - Just talk TLSv1.1\n"); BIO_printf(bio_err," -tls1 - Just talk TLSv1\n"); diff --git a/apps/s_time.c b/apps/s_time.c index b823c33..b4f2c9e 100644 --- a/apps/s_time.c +++ b/apps/s_time.c @@ -186,8 +186,12 @@ static void s_time_usage(void) printf("-connect host:port - host:port to connect to (default is %s)\n",SSL_CONNECT_NAME); #ifdef FIONBIO printf("-nbio - Run with non-blocking IO\n"); +#ifndef OPENSSL_NO_SSL2 printf("-ssl2 - Just use SSLv2\n"); +#endif +#ifndef OPENSSL_NO_SSL3 printf("-ssl3 - Just use SSLv3\n"); +#endif printf("-bugs - Turn on SSL bug compatibility\n"); printf("-new - Just time new connections\n"); printf("-reuse - Just time connection reuse\n"); -- 1.8.5.4 ______________________________________________________________________ OpenSSL Project http://www.openssl.org Development Mailing List [email protected] Automated List Manager [email protected]
