diff options
author | Guido van Rossum <guido@dropbox.com> | 2013-11-01 21:16:54 (GMT) |
---|---|---|
committer | Guido van Rossum <guido@dropbox.com> | 2013-11-01 21:16:54 (GMT) |
commit | 21c85a7124004bfbddf2c3db4085ec48842e90f6 (patch) | |
tree | da81a3150df7c9abdf63ff7e410c2a32157bf738 /Lib/asyncio/selector_events.py | |
parent | 2b430b8720f0d206491250220672d4f1d0189b5a (diff) | |
download | cpython-21c85a7124004bfbddf2c3db4085ec48842e90f6.zip cpython-21c85a7124004bfbddf2c3db4085ec48842e90f6.tar.gz cpython-21c85a7124004bfbddf2c3db4085ec48842e90f6.tar.bz2 |
asyncio: Add server_hostname as create_connection() argument, with secure default.
Diffstat (limited to 'Lib/asyncio/selector_events.py')
-rw-r--r-- | Lib/asyncio/selector_events.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py index e61a88d..44430b2 100644 --- a/Lib/asyncio/selector_events.py +++ b/Lib/asyncio/selector_events.py @@ -573,7 +573,7 @@ class _SelectorSslTransport(_SelectorTransport): 'server_side': server_side, 'do_handshake_on_connect': False, } - if server_hostname is not None and not server_side and ssl.HAS_SNI: + if server_hostname and not server_side and ssl.HAS_SNI: wrap_kwargs['server_hostname'] = server_hostname sslsock = sslcontext.wrap_socket(rawsock, **wrap_kwargs) @@ -619,7 +619,7 @@ class _SelectorSslTransport(_SelectorTransport): # Verify hostname if requested. peercert = self._sock.getpeercert() - if (self._server_hostname is not None and + if (self._server_hostname and self._sslcontext.verify_mode != ssl.CERT_NONE): try: ssl.match_hostname(peercert, self._server_hostname) |