diff options
| author | Joffrey F <joffrey@docker.com> | 2016-02-03 17:50:52 -0800 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2016-02-03 17:50:52 -0800 |
| commit | b808cc45b43a2de397e7e0fb2eb8c2d98250e263 (patch) | |
| tree | 3a5c605324c220b3862f476fbb135d68c969b0ac /docker/tls.py | |
| parent | a6a562a68102f548e87781a338219685b066c412 (diff) | |
| download | docker-py-ssl_version_simpler.tar.gz | |
Remove obsolete SSL version computationssl_version_simpler
Recent versions of urllib3 (including the one packaged by requests)
will automatically reject SSLv2/3.
Additional test to check urllib3's behavior (mostly for release/packaging)
Signed-off-by: Joffrey F <joffrey@docker.com>
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 94d736b..c6d0f6c 100644 --- a/docker/tls.py +++ b/docker/tls.py @@ -18,11 +18,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 |