| author | Petr Sumbera <petr.sumbera@oracle.com> |
| Tue, 23 Aug 2016 06:07:43 -0700 | |
| branch | s11u3-sru |
| changeset 6722 | f675056be479 |
| parent 4884 | 6ad716bfae77 |
| permissions | -rw-r--r-- |
|
4249
bb2990b48dfc
20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
1 |
Patch origin: in-house |
|
4884
6ad716bfae77
21485757 Upgrade Apache Web Server to version 2.4.16
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4249
diff
changeset
|
2 |
Patch status: unclear; so far they disable it just in configuration file |
|
6ad716bfae77
21485757 Upgrade Apache Web Server to version 2.4.16
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4249
diff
changeset
|
3 |
|
|
6ad716bfae77
21485757 Upgrade Apache Web Server to version 2.4.16
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4249
diff
changeset
|
4 |
https://bz.apache.org/bugzilla/show_bug.cgi?id=57120 |
|
4249
bb2990b48dfc
20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
|
|
bb2990b48dfc
20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
--- modules/ssl/ssl_private.h |
|
bb2990b48dfc
20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
+++ modules/ssl/ssl_private.h |
|
6722
f675056be479
24353766 Upgrade Apache Web Server to version 2.4.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4884
diff
changeset
|
8 |
@@ -302,7 +302,7 @@ |
|
f675056be479
24353766 Upgrade Apache Web Server to version 2.4.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4884
diff
changeset
|
9 |
#endif |
|
f675056be479
24353766 Upgrade Apache Web Server to version 2.4.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4884
diff
changeset
|
10 |
#define SSL_PROTOCOL_TLSV1 (1<<2) |
|
f675056be479
24353766 Upgrade Apache Web Server to version 2.4.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4884
diff
changeset
|
11 |
#ifndef OPENSSL_NO_SSL3 |
|
f675056be479
24353766 Upgrade Apache Web Server to version 2.4.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4884
diff
changeset
|
12 |
-#define SSL_PROTOCOL_BASIC (SSL_PROTOCOL_SSLV3|SSL_PROTOCOL_TLSV1) |
|
f675056be479
24353766 Upgrade Apache Web Server to version 2.4.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4884
diff
changeset
|
13 |
+#define SSL_PROTOCOL_BASIC (SSL_PROTOCOL_TLSV1) |
|
4249
bb2990b48dfc
20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
#else |
|
6722
f675056be479
24353766 Upgrade Apache Web Server to version 2.4.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4884
diff
changeset
|
15 |
#define SSL_PROTOCOL_BASIC (SSL_PROTOCOL_TLSV1) |
|
4249
bb2990b48dfc
20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
#endif |
|
bb2990b48dfc
20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
--- docs/manual/mod/mod_ssl.html.en |
|
bb2990b48dfc
20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
+++ docs/manual/mod/mod_ssl.html.en |
|
6722
f675056be479
24353766 Upgrade Apache Web Server to version 2.4.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4884
diff
changeset
|
19 |
@@ -1454,11 +1454,7 @@ |
|
4249
bb2990b48dfc
20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
|
|
bb2990b48dfc
20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
<li><code>all</code> |
|
bb2990b48dfc
20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
<p> |
|
bb2990b48dfc
20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
23 |
- This is a shortcut for ``<code>+SSLv3 +TLSv1</code>'' or |
|
bb2990b48dfc
20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
24 |
- - when using OpenSSL 1.0.1 and later - |
|
6722
f675056be479
24353766 Upgrade Apache Web Server to version 2.4.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4884
diff
changeset
|
25 |
- ``<code>+SSLv3 +TLSv1 +TLSv1.1 +TLSv1.2</code>'', respectively |
|
f675056be479
24353766 Upgrade Apache Web Server to version 2.4.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4884
diff
changeset
|
26 |
- (except for OpenSSL versions compiled with the ``no-ssl3'' configuration |
|
f675056be479
24353766 Upgrade Apache Web Server to version 2.4.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4884
diff
changeset
|
27 |
- option, where <code>all</code> does not include <code>+SSLv3</code>).</p></li> |
|
4249
bb2990b48dfc
20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
28 |
+ This is a shortcut for ``<code>+TLSv1 +TLSv1.1 +TLSv1.2</code>''.</p></li> |
|
bb2990b48dfc
20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
29 |
</ul> |
|
bb2990b48dfc
20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
30 |
<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">SSLProtocol TLSv1</pre> |
|
bb2990b48dfc
20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
31 |
</div> |
|
bb2990b48dfc
20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
32 |
--- docs/manual/mod/mod_ssl.html.fr |
|
bb2990b48dfc
20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
33 |
+++ docs/manual/mod/mod_ssl.html.fr |
|
6722
f675056be479
24353766 Upgrade Apache Web Server to version 2.4.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4884
diff
changeset
|
34 |
@@ -1635,11 +1635,7 @@ |
|
4249
bb2990b48dfc
20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
35 |
|
|
bb2990b48dfc
20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
36 |
<li><code>all</code> |
|
bb2990b48dfc
20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
37 |
<p> |
|
bb2990b48dfc
20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
38 |
- C'est un raccourci pour ``<code>+SSLv3 +TLSv1</code>'' ou - � partir |
|
6722
f675056be479
24353766 Upgrade Apache Web Server to version 2.4.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4884
diff
changeset
|
39 |
- de la version 1.0.1 d'OpenSSL - ``<code>+SSLv3 +TLSv1 +TLSv1.1 |
|
f675056be479
24353766 Upgrade Apache Web Server to version 2.4.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4884
diff
changeset
|
40 |
- +TLSv1.2</code>'' (sauf si OpenSSL a �t� compil� avec l'option |
|
f675056be479
24353766 Upgrade Apache Web Server to version 2.4.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4884
diff
changeset
|
41 |
- ``no-ssl3'', auquel cas <code>all</code> n'inclura pas |
|
f675056be479
24353766 Upgrade Apache Web Server to version 2.4.23
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4884
diff
changeset
|
42 |
- <code>+SSLv3</code>).</p></li> |
|
4249
bb2990b48dfc
20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
43 |
+ C'est un raccourci pour ``<code>+TLSv1 +TLSv1.1 +TLSv1.2</code>''.</p></li> |
|
bb2990b48dfc
20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
44 |
</ul> |
|
bb2990b48dfc
20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
45 |
<div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">SSLProtocol TLSv1</pre> |
|
bb2990b48dfc
20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
46 |
</div> |