| author | John Beck <John.Beck@Oracle.COM> |
| Fri, 09 Jan 2015 08:38:55 -0800 | |
| branch | s11-update |
| changeset 3645 | 7f9e7408bb02 |
| permissions | -rw-r--r-- |
|
3645
7f9e7408bb02
20231116 problem in UTILITY/PYTHON
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
1 |
This patch comes from in-house, and will not be passed upstream, since |
|
7f9e7408bb02
20231116 problem in UTILITY/PYTHON
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
2 |
Python 2.6 has been abandoned in favor of later versions. |
|
7f9e7408bb02
20231116 problem in UTILITY/PYTHON
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
3 |
|
|
7f9e7408bb02
20231116 problem in UTILITY/PYTHON
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
4 |
--- Python-2.6.8/Modules/_ssl.c.~2~ 2014-12-16 00:06:40.398956147 -0800 |
|
7f9e7408bb02
20231116 problem in UTILITY/PYTHON
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
5 |
+++ Python-2.6.8/Modules/_ssl.c 2015-01-08 12:43:53.326916627 -0800 |
|
7f9e7408bb02
20231116 problem in UTILITY/PYTHON
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
6 |
@@ -269,6 +269,7 @@ |
|
7f9e7408bb02
20231116 problem in UTILITY/PYTHON
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
7 |
char *errstr = NULL; |
|
7f9e7408bb02
20231116 problem in UTILITY/PYTHON
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
8 |
int ret; |
|
7f9e7408bb02
20231116 problem in UTILITY/PYTHON
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
9 |
int verification_mode; |
|
7f9e7408bb02
20231116 problem in UTILITY/PYTHON
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
10 |
+ long options; |
|
7f9e7408bb02
20231116 problem in UTILITY/PYTHON
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
11 |
|
|
7f9e7408bb02
20231116 problem in UTILITY/PYTHON
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
12 |
self = PyObject_New(PySSLObject, &PySSL_Type); /* Create new object */ |
|
7f9e7408bb02
20231116 problem in UTILITY/PYTHON
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
13 |
if (self == NULL) |
|
7f9e7408bb02
20231116 problem in UTILITY/PYTHON
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
14 |
@@ -359,8 +360,12 @@ |
|
7f9e7408bb02
20231116 problem in UTILITY/PYTHON
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
15 |
} |
|
7f9e7408bb02
20231116 problem in UTILITY/PYTHON
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
16 |
|
|
7f9e7408bb02
20231116 problem in UTILITY/PYTHON
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
17 |
/* ssl compatibility */ |
|
7f9e7408bb02
20231116 problem in UTILITY/PYTHON
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
18 |
- SSL_CTX_set_options(self->ctx, |
|
7f9e7408bb02
20231116 problem in UTILITY/PYTHON
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
19 |
- SSL_OP_ALL & ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS); |
|
7f9e7408bb02
20231116 problem in UTILITY/PYTHON
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
20 |
+ options = SSL_OP_ALL & ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS; |
|
7f9e7408bb02
20231116 problem in UTILITY/PYTHON
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
21 |
+ if (proto_version != PY_SSL_VERSION_SSL2) |
|
7f9e7408bb02
20231116 problem in UTILITY/PYTHON
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
22 |
+ options |= SSL_OP_NO_SSLv2; |
|
7f9e7408bb02
20231116 problem in UTILITY/PYTHON
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
23 |
+ if (proto_version != PY_SSL_VERSION_SSL3) |
|
7f9e7408bb02
20231116 problem in UTILITY/PYTHON
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
24 |
+ options |= SSL_OP_NO_SSLv3; |
|
7f9e7408bb02
20231116 problem in UTILITY/PYTHON
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
25 |
+ SSL_CTX_set_options(self->ctx, options); |
|
7f9e7408bb02
20231116 problem in UTILITY/PYTHON
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
26 |
|
|
7f9e7408bb02
20231116 problem in UTILITY/PYTHON
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
27 |
verification_mode = SSL_VERIFY_NONE; |
|
7f9e7408bb02
20231116 problem in UTILITY/PYTHON
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
28 |
if (certreq == PY_SSL_CERT_OPTIONAL) |