Issue #19784: poplib now supports SSLContext.check_hostname and server name
indication for TLS/SSL connections.
diff --git a/Lib/poplib.py b/Lib/poplib.py
index 00ffbcb..23a3517 100644
--- a/Lib/poplib.py
+++ b/Lib/poplib.py
@@ -387,7 +387,9 @@
if context is None:
context = ssl._create_stdlib_context()
resp = self._shortcmd('STLS')
- self.sock = context.wrap_socket(self.sock)
+ server_hostname = self.host if ssl.HAS_SNI else None
+ self.sock = context.wrap_socket(self.sock,
+ server_hostname=server_hostname)
self.file = self.sock.makefile('rb')
self._tls_established = True
return resp
@@ -428,7 +430,9 @@
def _create_socket(self, timeout):
sock = POP3._create_socket(self, timeout)
- sock = self.context.wrap_socket(sock)
+ server_hostname = self.host if ssl.HAS_SNI else None
+ sock = self.context.wrap_socket(sock,
+ server_hostname=server_hostname)
return sock
def stls(self, keyfile=None, certfile=None, context=None):