From: Rich Salz <rsalz@openssl.org>
Date: Tue, 2 Feb 2016 17:16:10 +0000 (-0500)
Subject: GH611: s_client help message bug
X-Git-Tag: OpenSSL_1_0_2g~42
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a2bab12a331b6764804913d08e2e472c9e5d13ae;p=oweals%2Fopenssl.git

GH611: s_client help message bug

Reviewed-by: Emilia Käsper <emilia@openssl.org>
---

diff --git a/apps/s_client.c b/apps/s_client.c
index caf76d35dc..0c1102b9c3 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -390,8 +390,6 @@ static void sc_usage(void)
                " -no_tls1_2/-no_tls1_1/-no_tls1/-no_ssl3/-no_ssl2 - turn off that protocol\n");
     BIO_printf(bio_err,
                " -bugs         - Switch on all SSL implementation bug workarounds\n");
-    BIO_printf(bio_err,
-               " -serverpref   - Use server's cipher preferences (only SSLv2)\n");
     BIO_printf(bio_err,
                " -cipher       - preferred cipher to use, use the 'openssl ciphers'\n");
     BIO_printf(bio_err,