1 Patch origin: in-house |
1 Patch origin: in-house |
2 Patch status: will be submitted to upstream |
2 Patch status: unclear; so far they disable it just in configuration file |
|
3 |
|
4 https://bz.apache.org/bugzilla/show_bug.cgi?id=57120 |
3 |
5 |
4 --- modules/ssl/ssl_private.h |
6 --- modules/ssl/ssl_private.h |
5 +++ modules/ssl/ssl_private.h |
7 +++ modules/ssl/ssl_private.h |
6 @@ -246,9 +246,9 @@ |
8 @@ -244,9 +244,9 @@ |
7 #define SSL_PROTOCOL_SSLV3 (1<<1) |
9 #define SSL_PROTOCOL_SSLV3 (1<<1) |
8 #define SSL_PROTOCOL_TLSV1 (1<<2) |
10 #define SSL_PROTOCOL_TLSV1 (1<<2) |
9 #ifdef OPENSSL_NO_SSL2 |
11 #ifdef OPENSSL_NO_SSL2 |
10 -#define SSL_MOST_ALL SSL_PROTOCOL_SSLV3|SSL_PROTOCOL_TLSV1 |
12 -#define SSL_MOST_ALL SSL_PROTOCOL_SSLV3|SSL_PROTOCOL_TLSV1 |
11 +#define SSL_MOST_ALL SSL_PROTOCOL_TLSV1 |
13 +#define SSL_MOST_ALL SSL_PROTOCOL_TLSV1 |
15 #endif |
17 #endif |
16 #ifdef HAVE_TLSV1_X |
18 #ifdef HAVE_TLSV1_X |
17 #define SSL_PROTOCOL_TLSV1_1 (1<<3) |
19 #define SSL_PROTOCOL_TLSV1_1 (1<<3) |
18 --- docs/manual/mod/mod_ssl.html.en |
20 --- docs/manual/mod/mod_ssl.html.en |
19 +++ docs/manual/mod/mod_ssl.html.en |
21 +++ docs/manual/mod/mod_ssl.html.en |
20 @@ -1029,8 +1029,8 @@ |
22 @@ -1082,8 +1082,8 @@ |
21 <p> |
23 <p> |
22 This is the Secure Sockets Layer (SSL) protocol, version 3.0, from |
24 This is the Secure Sockets Layer (SSL) protocol, version 3.0, from |
23 the Netscape Corporation. |
25 the Netscape Corporation. |
24 - It is the successor to SSLv2 and the predecessor to TLSv1. It's supported by |
26 - It is the successor to SSLv2 and the predecessor to TLSv1. It's supported by |
25 - almost all popular browsers.</p></li> |
27 - almost all popular browsers.</p></li> |
26 + It is the successor to SSLv2 and the predecessor to TLSv1. Though its |
28 + It is the successor to SSLv2 and the predecessor to TLSv1. Though its |
27 + use has been deprecated, because of weaknesses in the security of the protocol.</p></li> |
29 + use has been deprecated, because of weaknesses in the security of the protocol.</p></li> |
28 |
30 |
29 <li><code>TLSv1</code> |
31 <li><code>TLSv1</code> |
30 <p> |
32 <p> |
31 @@ -1050,13 +1050,11 @@ |
33 @@ -1103,13 +1103,11 @@ |
32 |
34 |
33 <li><code>All</code> |
35 <li><code>All</code> |
34 <p> |
36 <p> |
35 - This is a shortcut for ``<code>+SSLv2 +SSLv3 +TLSv1</code>'' or |
37 - This is a shortcut for ``<code>+SSLv2 +SSLv3 +TLSv1</code>'' or |
36 - - when using OpenSSL 1.0.1 and later - |
38 - - when using OpenSSL 1.0.1 and later - |