diff options
| author | Joffrey F <f.joffrey@gmail.com> | 2016-02-05 12:41:02 -0800 |
|---|---|---|
| committer | Joffrey F <f.joffrey@gmail.com> | 2016-02-05 12:41:02 -0800 |
| commit | 8bdaffc2e7feb6201744a58d5a1e7db83fae094b (patch) | |
| tree | 886a97d3fdc1846944874157aa25f094459a056c /docker/tls.py | |
| parent | 9d8663c5ab17fd4cd3e6a23c3dbbd949c3664482 (diff) | |
| parent | b808cc45b43a2de397e7e0fb2eb8c2d98250e263 (diff) | |
| download | docker-py-8bdaffc2e7feb6201744a58d5a1e7db83fae094b.tar.gz | |
Merge pull request #920 from docker/ssl_version_simpler
Remove obsolete SSL version computation
Diffstat (limited to 'docker/tls.py')
| -rw-r--r-- | docker/tls.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/docker/tls.py b/docker/tls.py index 85fa245..01573a6 100644 --- a/docker/tls.py +++ b/docker/tls.py @@ -19,11 +19,6 @@ class TLSConfig(object): # here, but also disable any public/default CA pool verification by # leaving tls_verify=False - # urllib3 sets a default ssl_version if ssl_version is None, - # but that default is the vulnerable PROTOCOL_SSLv23 selection, - # so we override the default with the maximum supported in the running - # Python interpeter up to TLS 1.2. (see: http://tinyurl.com/kxga8hb) - ssl_version = ssl_version or ssladapter.get_max_tls_protocol() self.ssl_version = ssl_version self.assert_hostname = assert_hostname self.assert_fingerprint = assert_fingerprint |