20912461 problem in UTILITY/CUPS s11u3-sru
authorPanchami Sanjeev <panchami.sanjeev@oracle.com>
Mon, 02 Nov 2015 22:21:32 -0800
branchs11u3-sru
changeset 5039 79d9b127b2f3
parent 5038 6b6c19165c25
child 5063 86c367271071
20912461 problem in UTILITY/CUPS
components/cups/patches/23-20231096.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/cups/patches/23-20231096.patch	Mon Nov 02 22:21:32 2015 -0800
@@ -0,0 +1,26 @@
+This patch was developed in-house.
+It is submitted upstream at https://www.cups.org/str.php?L4476+P-1+S0+C0+I0+E0+Q4476
+
+--- scheduler/client.c    2015-03-06 03:28:52.100318608 -0800
++++ scheduler/client.c    2015-03-06 03:35:41.539740276 -0800
[email protected]@ -3258,7 +3258,7 @@
+ 
+   context = SSL_CTX_new(SSLv23_server_method());
+ 
+-  SSL_CTX_set_options(context, SSL_OP_NO_SSLv2); /* Only use SSLv3 or TLS */
++  SSL_CTX_set_options(context, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3); /* Always disable SSLv2 & SSLv3 to "mitigate POODLE vulnerability". */
+   if (SSLOptions & CUPSD_SSL_NOEMPTY)
+     SSL_CTX_set_options(context, SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS);
+   SSL_CTX_use_PrivateKey_file(context, ServerKey, SSL_FILETYPE_PEM);
+--- cups/http.c   2015-03-06 03:27:05.266068026 -0800
++++ cups/http.c   2015-03-06 03:34:22.981276422 -0800
[email protected]@ -2972,7 +2972,7 @@
+ #  ifdef HAVE_LIBSSL
+   context = SSL_CTX_new(SSLv23_client_method());
+ 
+-  SSL_CTX_set_options(context, SSL_OP_NO_SSLv2); /* Only use SSLv3 or TLS */
++  SSL_CTX_set_options(context, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3); /* Always disable SSLv2 & SSLv3 to "mitigate POODLE vulnerability". */
+ 
+   bio = BIO_new(_httpBIOMethods());
+   BIO_ctrl(bio, BIO_C_SET_FILE_PTR, 0, (char *)http);
+