diff options
| author | liris <liris.pp@gmail.com> | 2015-04-20 08:34:35 +0900 |
|---|---|---|
| committer | liris <liris.pp@gmail.com> | 2015-04-20 08:34:35 +0900 |
| commit | 9cc99f2ee29447a3c17ac62c7e9cef3420d3fa9a (patch) | |
| tree | 9d85d481cabdc9378511d8828afc24afc5f26aae /websocket | |
| parent | 52a7cb56b3f8e6a6ab828ad17a646920226b1bda (diff) | |
| download | websocket-client-9cc99f2ee29447a3c17ac62c7e9cef3420d3fa9a.tar.gz | |
fixed #175
Diffstat (limited to 'websocket')
| -rw-r--r-- | websocket/_http.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/websocket/_http.py b/websocket/_http.py index 256ed29..3440223 100644 --- a/websocket/_http.py +++ b/websocket/_http.py @@ -125,9 +125,11 @@ def _can_use_sni(): def _wrap_sni_socket(sock, sslopt, hostname): context = ssl.create_default_context(cafile=sslopt.get('ca_certs', None)) context.options = sslopt.get('ssl_version', context.options) + context.check_hostname = sslopt.get('check_hostname', True) context.verify_mode = sslopt['cert_reqs'] if 'ciphers' in sslopt: context.set_ciphers(sslopt['ciphers']) + return context.wrap_socket( sock, do_handshake_on_connect=sslopt.get('do_handshake_on_connect', True), @@ -143,11 +145,12 @@ def _ssl_socket(sock, user_sslopt, hostname): if os.path.isfile(certPath): sslopt['ca_certs'] = certPath sslopt.update(user_sslopt) - check_hostname = sslopt.pop('check_hostname', True) + check_hostname = sslopt.get('check_hostname', True) if _can_use_sni(): sock = _wrap_sni_socket(sock, sslopt, hostname) else: + sslopt.pop('check_hostname', True) sock = ssl.wrap_socket(sock, **sslopt) if (sslopt["cert_reqs"] != ssl.CERT_NONE and check_hostname): |