commit 1a0bb626f4cfd95f7ec406ea7d3f9433def559fc
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Sat Mar 24 07:59:16 2018 -0700
committer Christian Heimes <christian@python.org> Sat Mar 24 15:59:16 2018 +0100
tree 9f4017db7476ec5d017df6e8e522b1242c9ebda9
parent ac5602746ed39ca6591e98e062e587121ac71371

[3.7] bpo-24334: Remove inaccurate match_hostname call (GH-6211) (#6212)

Commit 141c5e8c re-added match_hostname() call. The resurrection of the
function call was never intended and was solely a merge mistake.

Signed-off-by: Christian Heimes <christian@python.org>
(cherry picked from commit e42ae915095ebca789cc36f3a336a3331fe35945)

Co-authored-by: Christian Heimes <christian@python.org>

Lib/ssl.py

diff --git a/Lib/ssl.py b/Lib/ssl.py
index 2db8873..fdd1615 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -1106,11 +1106,6 @@
             if timeout == 0.0 and block:
                 self.settimeout(None)
             self._sslobj.do_handshake()
-            if self.context.check_hostname:
-                if not self.server_hostname:
-                    raise ValueError("check_hostname needs server_hostname "
-                                     "argument")
-                match_hostname(self.getpeercert(), self.server_hostname)
         finally:
             self.settimeout(timeout)