diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-05-04 20:23:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-05-04 20:23:31 +0000 |
| commit | 1a0556f0379061de2c12b5b34d790381a0e0674e (patch) | |
| tree | d89122a0a727442d9cd5f93d1983b9e212436e00 | |
| parent | fed4a815f33b2cc9d923ee0407bab50c00bc3575 (diff) | |
| parent | ee6b44f4d2123b15be8b80498a838e00553e2275 (diff) | |
| download | oslo-incubator-1a0556f0379061de2c12b5b34d790381a0e0674e.tar.gz | |
Merge "Fixed ssl.PROTOCOL_SSLv3 not supported by Python 2.7.9" into stable/icehouse
| -rw-r--r-- | openstack/common/sslutils.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/openstack/common/sslutils.py b/openstack/common/sslutils.py index 4a589e81..99b03078 100644 --- a/openstack/common/sslutils.py +++ b/openstack/common/sslutils.py @@ -81,7 +81,6 @@ def wrap(sock): _SSL_PROTOCOLS = { "tlsv1": ssl.PROTOCOL_TLSv1, "sslv23": ssl.PROTOCOL_SSLv23, - "sslv3": ssl.PROTOCOL_SSLv3 } try: @@ -89,6 +88,11 @@ try: except AttributeError: pass +try: + _SSL_PROTOCOLS["sslv3"] = ssl.PROTOCOL_SSLv3 +except AttributeError: + pass + def validate_ssl_version(version): key = version.lower() |