|
1 # |
|
2 # This patch fixes the usage bug: It shows '-ssl2' option even though it's not |
|
3 # available. The bug has been reported to the upstream: #3580. |
|
4 # |
|
5 --- openssl/apps/s_client.c.orig Tue Sep 15 13:33:45 2015 |
|
6 +++ openssl/apps/s_client.c Tue Sep 15 13:34:26 2015 |
|
7 @@ -376,7 +376,9 @@ |
|
8 " -srp_strength int - minimal length in bits for N (default %d).\n", |
|
9 SRP_MINIMAL_N); |
|
10 #endif |
|
11 +#ifndef OPENSSL_NO_SSL2 |
|
12 BIO_printf(bio_err, " -ssl2 - just use SSLv2\n"); |
|
13 +#endif |
|
14 #ifndef OPENSSL_NO_SSL3_METHOD |
|
15 BIO_printf(bio_err, " -ssl3 - just use SSLv3\n"); |
|
16 #endif |
|
17 --- openssl/apps/s_server.c.orig Tue Sep 15 13:33:58 2015 |
|
18 +++ openssl/apps/s_server.c Tue Sep 15 13:35:15 2015 |
|
19 @@ -592,7 +592,9 @@ |
|
20 BIO_printf(bio_err, |
|
21 " -srpuserseed string - A seed string for a default user salt.\n"); |
|
22 #endif |
|
23 +#ifndef OPENSSL_NO_SSL2 |
|
24 BIO_printf(bio_err, " -ssl2 - Just talk SSLv2\n"); |
|
25 +#endif |
|
26 #ifndef OPENSSL_NO_SSL3_METHOD |
|
27 BIO_printf(bio_err, " -ssl3 - Just talk SSLv3\n"); |
|
28 #endif |
|
29 No differences encountered |
|
30 --- openssl/apps/s_time.c.orig Tue Sep 15 13:33:53 2015 |
|
31 +++ openssl/apps/s_time.c Tue Sep 15 13:35:01 2015 |
|
32 @@ -190,8 +190,12 @@ |
|
33 SSL_CONNECT_NAME); |
|
34 #ifdef FIONBIO |
|
35 printf("-nbio - Run with non-blocking IO\n"); |
|
36 +#ifndef OPENSSL_NO_SSL2 |
|
37 printf("-ssl2 - Just use SSLv2\n"); |
|
38 +#endif |
|
39 +#ifndef OPENSSL_NO_SSL3_METHOD |
|
40 printf("-ssl3 - Just use SSLv3\n"); |
|
41 +#endif |
|
42 printf("-bugs - Turn on SSL bug compatibility\n"); |
|
43 printf("-new - Just time new connections\n"); |
|
44 printf("-reuse - Just time connection reuse\n"); |
|
45 --- openssl/apps/ciphers.c.orig Tue Sep 15 13:34:02 2015 |
|
46 +++ openssl/apps/ciphers.c Tue Sep 15 13:51:03 2015 |
|
47 @@ -73,8 +73,12 @@ |
|
48 "usage: ciphers args\n", |
|
49 " -v - verbose mode, a textual listing of the SSL/TLS ciphers in OpenSSL\n", |
|
50 " -V - even more verbose\n", |
|
51 +#ifndef OPENSSL_NO_SSL2 |
|
52 " -ssl2 - SSL2 mode\n", |
|
53 +#endif |
|
54 +#ifndef OPENSSL_NO_SSL3_METHOD |
|
55 " -ssl3 - SSL3 mode\n", |
|
56 +#endif |
|
57 " -tls1 - TLS1 mode\n", |
|
58 NULL |
|
59 }; |