| author | John Beck <John.Beck@Oracle.COM> |
| Thu, 21 Jul 2016 12:51:35 -0700 | |
| changeset 6445 | 0edecb568b2e |
| parent 4733 | 87d0de8972c0 |
| child 7516 | 09c933391a1b |
| permissions | -rw-r--r-- |
|
4733
87d0de8972c0
21381333 Python 2.7 regression test test_ssl fails
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
1 |
This patch comes from in-house, to deal with SSLv2 no longer being supported. |
|
87d0de8972c0
21381333 Python 2.7 regression test test_ssl fails
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
2 |
As it is Solaris-specific, it will not be passed upstream. |
|
87d0de8972c0
21381333 Python 2.7 regression test test_ssl fails
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
3 |
|
|
87d0de8972c0
21381333 Python 2.7 regression test test_ssl fails
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
4 |
--- Python-2.7.10/Lib/test/test_ssl.py.orig 2015-07-24 14:34:42.067600359 -0700 |
|
87d0de8972c0
21381333 Python 2.7 regression test test_ssl fails
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
5 |
+++ Python-2.7.10/Lib/test/test_ssl.py 2015-08-03 11:48:02.934532909 -0700 |
|
6445
0edecb568b2e
23858073 Upgrade Python 2.7 line to 2.7.12
John Beck <John.Beck@Oracle.COM>
parents:
4733
diff
changeset
|
6 |
@@ -25,6 +25,9 @@ |
|
4733
87d0de8972c0
21381333 Python 2.7 regression test test_ssl fails
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
7 |
ssl = support.import_module("ssl")
|
|
87d0de8972c0
21381333 Python 2.7 regression test test_ssl fails
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
8 |
|
|
87d0de8972c0
21381333 Python 2.7 regression test test_ssl fails
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
9 |
PROTOCOLS = sorted(ssl._PROTOCOL_NAMES) |
|
87d0de8972c0
21381333 Python 2.7 regression test test_ssl fails
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
10 |
+if hasattr(ssl, 'PROTOCOL_SSLv2'): |
|
87d0de8972c0
21381333 Python 2.7 regression test test_ssl fails
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
11 |
+ delattr(ssl, 'PROTOCOL_SSLv2') |
|
87d0de8972c0
21381333 Python 2.7 regression test test_ssl fails
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
12 |
+ PROTOCOLS.remove(0) |
|
87d0de8972c0
21381333 Python 2.7 regression test test_ssl fails
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
13 |
HOST = support.HOST |
|
87d0de8972c0
21381333 Python 2.7 regression test test_ssl fails
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
14 |
|
|
87d0de8972c0
21381333 Python 2.7 regression test test_ssl fails
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
15 |
def data_file(*name): |