| author | Devjani Ray <devjani.ray@oracle.com> |
| Fri, 14 Aug 2015 15:36:22 -0400 | |
| changeset 4778 | f8e00b2d7e90 |
| permissions | -rw-r--r-- |
|
4778
f8e00b2d7e90
21628600 Remove the use of PROTOCOL_SSLv3
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
1 |
In-house patch to disable SSLv3 support. |
|
f8e00b2d7e90
21628600 Remove the use of PROTOCOL_SSLv3
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
2 |
(See also upstream bug #1395095) |
|
f8e00b2d7e90
21628600 Remove the use of PROTOCOL_SSLv3
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
3 |
|
|
f8e00b2d7e90
21628600 Remove the use of PROTOCOL_SSLv3
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
4 |
--- neutron-2014.2.2/neutron/openstack/common/sslutils.py.orig 2015-08-13 21:05:44.916269265 -0400 |
|
f8e00b2d7e90
21628600 Remove the use of PROTOCOL_SSLv3
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
5 |
+++ neutron-2014.2.2/neutron/openstack/common/sslutils.py 2015-08-13 20:37:57.022549534 -0400 |
|
f8e00b2d7e90
21628600 Remove the use of PROTOCOL_SSLv3
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
6 |
@@ -80,8 +80,7 @@ |
|
f8e00b2d7e90
21628600 Remove the use of PROTOCOL_SSLv3
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
7 |
|
|
f8e00b2d7e90
21628600 Remove the use of PROTOCOL_SSLv3
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
8 |
_SSL_PROTOCOLS = {
|
|
f8e00b2d7e90
21628600 Remove the use of PROTOCOL_SSLv3
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
9 |
"tlsv1": ssl.PROTOCOL_TLSv1, |
|
f8e00b2d7e90
21628600 Remove the use of PROTOCOL_SSLv3
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
10 |
- "sslv23": ssl.PROTOCOL_SSLv23, |
|
f8e00b2d7e90
21628600 Remove the use of PROTOCOL_SSLv3
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
11 |
- "sslv3": ssl.PROTOCOL_SSLv3 |
|
f8e00b2d7e90
21628600 Remove the use of PROTOCOL_SSLv3
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
12 |
+ "sslv23": ssl.PROTOCOL_SSLv23 |
|
f8e00b2d7e90
21628600 Remove the use of PROTOCOL_SSLv3
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
13 |
} |
|
f8e00b2d7e90
21628600 Remove the use of PROTOCOL_SSLv3
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
14 |
|
|
f8e00b2d7e90
21628600 Remove the use of PROTOCOL_SSLv3
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
15 |
try: |
|
f8e00b2d7e90
21628600 Remove the use of PROTOCOL_SSLv3
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
16 |
@@ -89,6 +88,11 @@ |
|
f8e00b2d7e90
21628600 Remove the use of PROTOCOL_SSLv3
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
17 |
except AttributeError: |
|
f8e00b2d7e90
21628600 Remove the use of PROTOCOL_SSLv3
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
18 |
pass |
|
f8e00b2d7e90
21628600 Remove the use of PROTOCOL_SSLv3
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
19 |
|
|
f8e00b2d7e90
21628600 Remove the use of PROTOCOL_SSLv3
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
20 |
+try: |
|
f8e00b2d7e90
21628600 Remove the use of PROTOCOL_SSLv3
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
21 |
+ _SSL_PROTOCOLS["sslv3"] = ssl.PROTOCOL_SSLv3 |
|
f8e00b2d7e90
21628600 Remove the use of PROTOCOL_SSLv3
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
22 |
+except AttributeError: |
|
f8e00b2d7e90
21628600 Remove the use of PROTOCOL_SSLv3
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
23 |
+ pass |
|
f8e00b2d7e90
21628600 Remove the use of PROTOCOL_SSLv3
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
24 |
+ |
|
f8e00b2d7e90
21628600 Remove the use of PROTOCOL_SSLv3
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
25 |
|
|
f8e00b2d7e90
21628600 Remove the use of PROTOCOL_SSLv3
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
26 |
def validate_ssl_version(version): |
|
f8e00b2d7e90
21628600 Remove the use of PROTOCOL_SSLv3
Devjani Ray <devjani.ray@oracle.com>
parents:
diff
changeset
|
27 |
key = version.lower() |