openstack
/
oslo.messaging
Code Issues Proposed changes

Merge "Remove the use of PROTOCOL_SSLv3"

This commit is contained in:
Jenkins 2014-11-28 08:09:13 +00:00 committed by Gerrit Code Review
parent b631f46c7f 42f55a1dda
commit bd56131b58
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
oslo/messaging/_drivers/impl_rabbit.py
View File

@ -41,8 +41,8 @@ rabbit_opts = [
cfg.StrOpt('kombu_ssl_version', cfg.StrOpt('kombu_ssl_version',
default='', default='',
help='SSL version to use (valid only if SSL enabled). ' help='SSL version to use (valid only if SSL enabled). '
'valid values are TLSv1, SSLv23 and SSLv3. SSLv2 may ' 'valid values are TLSv1 and SSLv23. SSLv2 and '
'be available on some distributions.' 'SSLv3 may be available on some distributions.'
), ),
cfg.StrOpt('kombu_ssl_keyfile', cfg.StrOpt('kombu_ssl_keyfile',
default='', default='',
@ -496,8 +496,7 @@ class Connection(object):
# FIXME(markmc): use oslo sslutils when it is available as a library # FIXME(markmc): use oslo sslutils when it is available as a library
_SSL_PROTOCOLS = { _SSL_PROTOCOLS = {
"tlsv1": ssl.PROTOCOL_TLSv1, "tlsv1": ssl.PROTOCOL_TLSv1,
"sslv23": ssl.PROTOCOL_SSLv23, "sslv23": ssl.PROTOCOL_SSLv23
"sslv3": ssl.PROTOCOL_SSLv3
} }
try: try:
@ -505,6 +504,11 @@ class Connection(object):
except AttributeError: except AttributeError:
pass pass
try:
_SSL_PROTOCOLS["sslv3"] = ssl.PROTOCOL_SSLv3
except AttributeError:
pass
@classmethod @classmethod
def validate_ssl_version(cls, version): def validate_ssl_version(cls, version):
key = version.lower() key = version.lower()