components/apache24/patches/no_ssl3.patch
author Rich Burridge <rich.burridge@oracle.com>
Fri, 08 Jan 2016 14:43:57 -0800
changeset 5251 884af3874810
parent 4697 2be298b79293
child 5828 5009deba8bc0
child 6722 f675056be479
permissions -rw-r--r--
22519481 libserf needs to be told what compiler to use
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
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     8
@@ -298,10 +298,10 @@
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     9
 #ifdef HAVE_TLSV1_X
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    10
 #define SSL_PROTOCOL_TLSV1_1 (1<<3)
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    11
 #define SSL_PROTOCOL_TLSV1_2 (1<<4)
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    12
-#define SSL_PROTOCOL_ALL   (SSL_PROTOCOL_SSLV3|SSL_PROTOCOL_TLSV1| \
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    13
+#define SSL_PROTOCOL_ALL   (SSL_PROTOCOL_TLSV1| \
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    14
                             SSL_PROTOCOL_TLSV1_1|SSL_PROTOCOL_TLSV1_2)
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    15
 #else
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    16
-#define SSL_PROTOCOL_ALL   (SSL_PROTOCOL_SSLV3|SSL_PROTOCOL_TLSV1)
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    17
+#define SSL_PROTOCOL_ALL   (SSL_PROTOCOL_TLSV1)
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    18
 #endif
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    19
 typedef int ssl_proto_t;
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
--- docs/manual/mod/mod_ssl.html.en
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    22
+++ docs/manual/mod/mod_ssl.html.en
4697
2be298b79293 21485757 Upgrade Apache Web Server to version 2.4.16
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4052
diff changeset
    23
@@ -1369,9 +1361,7 @@
4052
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    24
 
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    25
 <li><code>all</code>
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    26
     <p>
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    27
-    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
    28
-    - when using OpenSSL 1.0.1 and later -
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    29
-    ``<code>+SSLv3 +TLSv1 +TLSv1.1 +TLSv1.2</code>, respectively.</p></li>
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    30
+    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
    31
 </ul>
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    32
 <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
    33
 </div>
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    34
--- docs/manual/mod/mod_ssl.html.fr
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    35
+++ docs/manual/mod/mod_ssl.html.fr
4697
2be298b79293 21485757 Upgrade Apache Web Server to version 2.4.16
Petr Sumbera <petr.sumbera@oracle.com>
parents: 4052
diff changeset
    36
@@ -1548,8 +1545,7 @@
4052
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    37
 
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    38
 <li><code>all</code>
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    39
     <p>
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    40
-    C'est un raccourci pour ``<code>+SSLv3 +TLSv1</code>'' ou - � partir
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    41
-    de la version 1.0.1 d'OpenSSL - ``<code>+SSLv3 +TLSv1 +TLSv1.1 +TLSv1.2</code>.</p></li>
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    42
+    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
    43
 </ul>
dd17ecf751c3 20813188 problem in UTILITY/APACHE
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    44
 <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
    45
 </div>