[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Rich Salz]

The branch OpenSSL_1_0_2-stable has been updated
       via  a2bab12a331b6764804913d08e2e472c9e5d13ae (commit)
      from  106dbca36cb6cf2f63d76eb5ee4f8398adf81fff (commit)


- Log -----------------------------------------------------------------
commit a2bab12a331b6764804913d08e2e472c9e5d13ae
Author: Rich Salz <rsalz at openssl.org>
Date:   Tue Feb 2 12:16:10 2016 -0500

    GH611: s_client help message bug
    
    Reviewed-by: Emilia Käsper <emilia at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/s_client.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/s_client.c b/apps/s_client.c
index caf76d3..0c1102b 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -391,8 +391,6 @@ static void sc_usage(void)
     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,
                "                 command to see what is available\n");