From 1a0bb626f4cfd95f7ec406ea7d3f9433def559fc Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Sat, 24 Mar 2018 07:59:16 -0700 Subject: [PATCH] [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 (cherry picked from commit e42ae915095ebca789cc36f3a336a3331fe35945) Co-authored-by: Christian Heimes --- Lib/ssl.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Lib/ssl.py b/Lib/ssl.py index 2db88735471..fdd16157443 100644 --- a/Lib/ssl.py +++ b/Lib/ssl.py @@ -1106,11 +1106,6 @@ class SSLSocket(socket): 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)