components/apache24/patches/no_ssl3.patch
author pkidd <patrick.kidd@oracle.com>
Thu, 01 Dec 2016 09:15:00 -0800
branchs11u3-sru
changeset 7423 a17eef087a5e
parent 6722 f675056be479
permissions -rw-r--r--
Added tag 0.175.3.15.0.4.0, S11.3SRU15.4 for changeset f2e0a2f2bfc0

Patch origin: in-house
Patch status: unclear; so far they disable it just in configuration file

https://bz.apache.org/bugzilla/show_bug.cgi?id=57120

--- modules/ssl/ssl_private.h
+++ modules/ssl/ssl_private.h
@@ -302,7 +302,7 @@
 #endif
 #define SSL_PROTOCOL_TLSV1 (1<<2)
 #ifndef OPENSSL_NO_SSL3
-#define SSL_PROTOCOL_BASIC (SSL_PROTOCOL_SSLV3|SSL_PROTOCOL_TLSV1)
+#define SSL_PROTOCOL_BASIC (SSL_PROTOCOL_TLSV1)
 #else
 #define SSL_PROTOCOL_BASIC (SSL_PROTOCOL_TLSV1)
 #endif
--- docs/manual/mod/mod_ssl.html.en
+++ docs/manual/mod/mod_ssl.html.en
@@ -1454,11 +1454,7 @@
 
 <li><code>all</code>
     <p>
-    This is a shortcut for ``<code>+SSLv3 +TLSv1</code>'' or
-    - when using OpenSSL 1.0.1 and later -
-    ``<code>+SSLv3 +TLSv1 +TLSv1.1 +TLSv1.2</code>'', respectively
-    (except for OpenSSL versions compiled with the ``no-ssl3'' configuration
-    option, where <code>all</code> does not include <code>+SSLv3</code>).</p></li>
+    This is a shortcut for ``<code>+TLSv1 +TLSv1.1 +TLSv1.2</code>''.</p></li>
 </ul>
 <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">SSLProtocol TLSv1</pre>
 </div>
--- docs/manual/mod/mod_ssl.html.fr
+++ docs/manual/mod/mod_ssl.html.fr
@@ -1635,11 +1635,7 @@
 
 <li><code>all</code>
     <p>
-    C'est un raccourci pour ``<code>+SSLv3 +TLSv1</code>'' ou - � partir
-    de la version 1.0.1 d'OpenSSL - ``<code>+SSLv3 +TLSv1 +TLSv1.1
-    +TLSv1.2</code>'' (sauf si OpenSSL a �t� compil� avec l'option
-    ``no-ssl3'', auquel cas <code>all</code> n'inclura pas
-    <code>+SSLv3</code>).</p></li>
+    C'est un raccourci pour ``<code>+TLSv1 +TLSv1.1 +TLSv1.2</code>''.</p></li>
 </ul>
 <div class="example"><h3>Exemple</h3><pre class="prettyprint lang-config">SSLProtocol TLSv1</pre>
 </div>