From 7243b574e5fc6f9ae68dc5ebd8252047b8e78e3b Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sun, 23 Nov 2014 17:04:34 -0600 Subject: don't require OpenSSL SNI to pass hostname to ssl functions (#22921) Patch by Donald Stufft. --- Lib/imaplib.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'Lib/imaplib.py') diff --git a/Lib/imaplib.py b/Lib/imaplib.py index ad104fe76a7..72ab5d79e5f 100644 --- a/Lib/imaplib.py +++ b/Lib/imaplib.py @@ -745,9 +745,8 @@ class IMAP4: ssl_context = ssl._create_stdlib_context() typ, dat = self._simple_command(name) if typ == 'OK': - server_hostname = self.host if ssl.HAS_SNI else None self.sock = ssl_context.wrap_socket(self.sock, - server_hostname=server_hostname) + server_hostname=self.host) self.file = self.sock.makefile('rb') self._tls_established = True self._get_capabilities() @@ -1223,9 +1222,8 @@ if HAVE_SSL: def _create_socket(self): sock = IMAP4._create_socket(self) - server_hostname = self.host if ssl.HAS_SNI else None return self.ssl_context.wrap_socket(sock, - server_hostname=server_hostname) + server_hostname=self.host) def open(self, host='', port=IMAP4_SSL_PORT): """Setup connection to remote server on "host:port". -- cgit v1.2.3