4908N/A#

4908N/A# This patch fixes the usage bug: It shows '-ssl2' option even though it's not

4908N/A# available. The bug has been reported to the upstream: #3580.

4908N/A#

4908N/A--- openssl/apps/s_client.c.orig Tue Sep 15 13:33:45 2015

4908N/A+++ openssl/apps/s_client.c Tue Sep 15 13:34:26 2015

4908N/A@@ -376,7 +376,9 @@

4908N/A " -srp_strength int - minimal length in bits for N (default %d).\n",

4908N/A SRP_MINIMAL_N);

4908N/A #endif

4908N/A+#ifndef OPENSSL_NO_SSL2

4908N/A BIO_printf(bio_err, " -ssl2 - just use SSLv2\n");

4908N/A+#endif

4908N/A #ifndef OPENSSL_NO_SSL3_METHOD

4908N/A BIO_printf(bio_err, " -ssl3 - just use SSLv3\n");

4908N/A #endif

4908N/A--- openssl/apps/s_server.c.orig Tue Sep 15 13:33:58 2015

4908N/A+++ openssl/apps/s_server.c Tue Sep 15 13:35:15 2015

4908N/A@@ -592,7 +592,9 @@

4908N/A BIO_printf(bio_err,

4908N/A " -srpuserseed string - A seed string for a default user salt.\n");

4908N/A #endif

4908N/A+#ifndef OPENSSL_NO_SSL2

4908N/A BIO_printf(bio_err, " -ssl2 - Just talk SSLv2\n");

4908N/A+#endif

4908N/A #ifndef OPENSSL_NO_SSL3_METHOD

4908N/A BIO_printf(bio_err, " -ssl3 - Just talk SSLv3\n");

4908N/A #endif

4908N/ANo differences encountered

4908N/A--- openssl/apps/s_time.c.orig Tue Sep 15 13:33:53 2015

4908N/A+++ openssl/apps/s_time.c Tue Sep 15 13:35:01 2015

4908N/A@@ -190,8 +190,12 @@

4908N/A SSL_CONNECT_NAME);

4908N/A #ifdef FIONBIO

4908N/A printf("-nbio - Run with non-blocking IO\n");

4908N/A+#ifndef OPENSSL_NO_SSL2

4908N/A printf("-ssl2 - Just use SSLv2\n");

4908N/A+#endif

4908N/A+#ifndef OPENSSL_NO_SSL3_METHOD

4908N/A printf("-ssl3 - Just use SSLv3\n");

4908N/A+#endif

4908N/A printf("-bugs - Turn on SSL bug compatibility\n");

4908N/A printf("-new - Just time new connections\n");

4908N/A printf("-reuse - Just time connection reuse\n");

4908N/A--- openssl/apps/ciphers.c.orig Tue Sep 15 13:34:02 2015

4908N/A+++ openssl/apps/ciphers.c Tue Sep 15 13:51:03 2015

4908N/A@@ -73,8 +73,12 @@

4908N/A "usage: ciphers args\n",

4908N/A " -v - verbose mode, a textual listing of the SSL/TLS ciphers in OpenSSL\n",

4908N/A " -V - even more verbose\n",

4908N/A+#ifndef OPENSSL_NO_SSL2

4908N/A " -ssl2 - SSL2 mode\n",

4908N/A+#endif

4908N/A+#ifndef OPENSSL_NO_SSL3_METHOD

4908N/A " -ssl3 - SSL3 mode\n",

4908N/A+#endif

4908N/A " -tls1 - TLS1 mode\n",

4908N/A NULL

4908N/A };