components/apache24/patches/no_ssl3.patch
author Rich Burridge <rich.burridge@oracle.com>
Tue, 02 May 2017 17:33:26 -0700
changeset 7964 d9801318ed3d
parent 6502 568ea88798fa
permissions -rw-r--r--
25981468 Build ilmbase and openexr with the GNU compilers
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4052
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     1
Patch origin: in-house
4697
2be298b79293 21485757 Upgrade Apache Web Server to version 2.4.16
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4052
diff changeset
     2
Patch status: unclear; so far they disable it just in configuration file
2be298b79293 21485757 Upgrade Apache Web Server to version 2.4.16
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4052
diff changeset
     3
2be298b79293 21485757 Upgrade Apache Web Server to version 2.4.16
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4052
diff changeset
     4
https://bz.apache.org/bugzilla/show_bug.cgi?id=57120
4052
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     5
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     6
--- modules/ssl/ssl_private.h
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     7
+++ modules/ssl/ssl_private.h
5828
5009deba8bc0 23128706 Upgrade Apache Web Server to version 2.4.20
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4697
diff changeset
     8
@@ -302,7 +302,7 @@
5009deba8bc0 23128706 Upgrade Apache Web Server to version 2.4.20
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4697
diff changeset
     9
 #endif
5009deba8bc0 23128706 Upgrade Apache Web Server to version 2.4.20
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4697
diff changeset
    10
 #define SSL_PROTOCOL_TLSV1 (1<<2)
5009deba8bc0 23128706 Upgrade Apache Web Server to version 2.4.20
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4697
diff changeset
    11
 #ifndef OPENSSL_NO_SSL3
5009deba8bc0 23128706 Upgrade Apache Web Server to version 2.4.20
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4697
diff changeset
    12
-#define SSL_PROTOCOL_BASIC (SSL_PROTOCOL_SSLV3|SSL_PROTOCOL_TLSV1)
5009deba8bc0 23128706 Upgrade Apache Web Server to version 2.4.20
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4697
diff changeset
    13
+#define SSL_PROTOCOL_BASIC (SSL_PROTOCOL_TLSV1)
4052
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    14
 #else
5828
5009deba8bc0 23128706 Upgrade Apache Web Server to version 2.4.20
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4697
diff changeset
    15
 #define SSL_PROTOCOL_BASIC (SSL_PROTOCOL_TLSV1)
4052
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    16
 #endif
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    17
--- docs/manual/mod/mod_ssl.html.en
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    18
+++ docs/manual/mod/mod_ssl.html.en
6502
568ea88798fa 24353766 Upgrade Apache Web Server to version 2.4.23
Petr Sumbera <petr.sumbera@oracle.com>
parents: 5828
diff changeset
    19
@@ -1454,11 +1454,7 @@
4052
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    20
 
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    21
 <li><code>all</code>
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    22
     <p>
dd17ecf751c3 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
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    24
-    - when using OpenSSL 1.0.1 and later -
5828
5009deba8bc0 23128706 Upgrade Apache Web Server to version 2.4.20
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4697
diff changeset
    25
-    ``<code>+SSLv3 +TLSv1 +TLSv1.1 +TLSv1.2</code>'', respectively
5009deba8bc0 23128706 Upgrade Apache Web Server to version 2.4.20
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4697
diff changeset
    26
-    (except for OpenSSL versions compiled with the ``no-ssl3'' configuration
5009deba8bc0 23128706 Upgrade Apache Web Server to version 2.4.20
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4697
diff changeset
    27
-    option, where <code>all</code> does not include <code>+SSLv3</code>).</p></li>
4052
dd17ecf751c3 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>
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    29
 </ul>
dd17ecf751c3 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>
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    31
 </div>
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    32
--- docs/manual/mod/mod_ssl.html.fr
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    33
+++ docs/manual/mod/mod_ssl.html.fr
6502
568ea88798fa 24353766 Upgrade Apache Web Server to version 2.4.23
Petr Sumbera <petr.sumbera@oracle.com>
parents: 5828
diff changeset
    34
@@ -1635,11 +1635,7 @@
4052
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    35
 
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    36
 <li><code>all</code>
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    37
     <p>
dd17ecf751c3 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
5828
5009deba8bc0 23128706 Upgrade Apache Web Server to version 2.4.20
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4697
diff changeset
    39
-    de la version 1.0.1 d'OpenSSL - ``<code>+SSLv3 +TLSv1 +TLSv1.1
5009deba8bc0 23128706 Upgrade Apache Web Server to version 2.4.20
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4697
diff changeset
    40
-    +TLSv1.2</code>'' (sauf si OpenSSL a �t� compil� avec l'option
5009deba8bc0 23128706 Upgrade Apache Web Server to version 2.4.20
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4697
diff changeset
    41
-    ``no-ssl3'', auquel cas <code>all</code> n'inclura pas
5009deba8bc0 23128706 Upgrade Apache Web Server to version 2.4.20
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4697
diff changeset
    42
-    <code>+SSLv3</code>).</p></li>
4052
dd17ecf751c3 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>
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    44
 </ul>
dd17ecf751c3 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>
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    46
 </div>