Repository: libcloud Updated Branches: refs/heads/trunk 43cec4eb3 -> ec4ac702f
Allow user to specify which version of SSL protocol to use by setting libcloud.security.SSL_VERSION variable (we still default to ssl.PROTOCOL_TLSv1). Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/c3ad78b5 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/c3ad78b5 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/c3ad78b5 Branch: refs/heads/trunk Commit: c3ad78b55963f5b34a0a805fb74294ba8e6854e3 Parents: c0f0de7 Author: Tomaz Muraus <[email protected]> Authored: Sat Nov 22 15:10:26 2014 +0800 Committer: Tomaz Muraus <[email protected]> Committed: Sat Nov 22 15:11:01 2014 +0800 ---------------------------------------------------------------------- libcloud/httplib_ssl.py | 2 +- libcloud/security.py | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/c3ad78b5/libcloud/httplib_ssl.py ---------------------------------------------------------------------- diff --git a/libcloud/httplib_ssl.py b/libcloud/httplib_ssl.py index 00eef93..bb569fb 100644 --- a/libcloud/httplib_ssl.py +++ b/libcloud/httplib_ssl.py @@ -277,7 +277,7 @@ class LibcloudHTTPSConnection(httplib.HTTPSConnection, LibcloudBaseConnection): self.cert_file, cert_reqs=ssl.CERT_REQUIRED, ca_certs=self.ca_cert, - ssl_version=ssl.PROTOCOL_TLSv1) + ssl_version=libcloud.security.SSL_VERSION) cert = self.sock.getpeercert() try: match_hostname(cert, self.host) http://git-wip-us.apache.org/repos/asf/libcloud/blob/c3ad78b5/libcloud/security.py ---------------------------------------------------------------------- diff --git a/libcloud/security.py b/libcloud/security.py index 81d7a51..4d024db 100644 --- a/libcloud/security.py +++ b/libcloud/security.py @@ -24,9 +24,18 @@ Usage: """ import os +import ssl + +__all__ = [ + 'VERIFY_SSL_CERT', + 'SSL_VERSION', + 'CA_CERTS_PATH' +] VERIFY_SSL_CERT = True +SSL_VERSION = ssl.PROTOCOL_TLSv1 + # File containing one or more PEM-encoded CA certificates # concatenated together. CA_CERTS_PATH = [
