| author | pkidd <patrick.kidd@oracle.com> |
| Wed, 22 Mar 2017 09:27:09 -0700 | |
| branch | s11u3-sru |
| changeset 7792 | ee802f9b5132 |
| parent 5039 | 79d9b127b2f3 |
| permissions | -rw-r--r-- |
|
5039
79d9b127b2f3
20912461 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
1 |
This patch was developed in-house. |
|
79d9b127b2f3
20912461 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
2 |
It is submitted upstream at https://www.cups.org/str.php?L4476+P-1+S0+C0+I0+E0+Q4476 |
|
79d9b127b2f3
20912461 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
3 |
|
|
79d9b127b2f3
20912461 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
4 |
--- scheduler/client.c 2015-03-06 03:28:52.100318608 -0800 |
|
79d9b127b2f3
20912461 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
5 |
+++ scheduler/client.c 2015-03-06 03:35:41.539740276 -0800 |
|
79d9b127b2f3
20912461 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
6 |
@@ -3258,7 +3258,7 @@ |
|
79d9b127b2f3
20912461 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
7 |
|
|
79d9b127b2f3
20912461 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
8 |
context = SSL_CTX_new(SSLv23_server_method()); |
|
79d9b127b2f3
20912461 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
9 |
|
|
79d9b127b2f3
20912461 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
10 |
- SSL_CTX_set_options(context, SSL_OP_NO_SSLv2); /* Only use SSLv3 or TLS */ |
|
79d9b127b2f3
20912461 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
11 |
+ SSL_CTX_set_options(context, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3); /* Always disable SSLv2 & SSLv3 to "mitigate POODLE vulnerability". */ |
|
79d9b127b2f3
20912461 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
12 |
if (SSLOptions & CUPSD_SSL_NOEMPTY) |
|
79d9b127b2f3
20912461 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
13 |
SSL_CTX_set_options(context, SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS); |
|
79d9b127b2f3
20912461 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
14 |
SSL_CTX_use_PrivateKey_file(context, ServerKey, SSL_FILETYPE_PEM); |
|
79d9b127b2f3
20912461 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
15 |
--- cups/http.c 2015-03-06 03:27:05.266068026 -0800 |
|
79d9b127b2f3
20912461 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
16 |
+++ cups/http.c 2015-03-06 03:34:22.981276422 -0800 |
|
79d9b127b2f3
20912461 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
17 |
@@ -2972,7 +2972,7 @@ |
|
79d9b127b2f3
20912461 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
18 |
# ifdef HAVE_LIBSSL |
|
79d9b127b2f3
20912461 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
19 |
context = SSL_CTX_new(SSLv23_client_method()); |
|
79d9b127b2f3
20912461 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
20 |
|
|
79d9b127b2f3
20912461 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
21 |
- SSL_CTX_set_options(context, SSL_OP_NO_SSLv2); /* Only use SSLv3 or TLS */ |
|
79d9b127b2f3
20912461 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
22 |
+ SSL_CTX_set_options(context, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3); /* Always disable SSLv2 & SSLv3 to "mitigate POODLE vulnerability". */ |
|
79d9b127b2f3
20912461 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
23 |
|
|
79d9b127b2f3
20912461 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
24 |
bio = BIO_new(_httpBIOMethods()); |
|
79d9b127b2f3
20912461 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
25 |
BIO_ctrl(bio, BIO_C_SET_FILE_PTR, 0, (char *)http); |
|
79d9b127b2f3
20912461 problem in UTILITY/CUPS
Panchami Sanjeev <panchami.sanjeev@oracle.com>
parents:
diff
changeset
|
26 |