follow-up prev

This commit is contained in:
SomberNight 2018-06-22 18:32:01 +02:00
parent 5220451b73
commit 5f050aa13e
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9

View file

@ -145,17 +145,16 @@ class TcpConnection(threading.Thread, util.PrintError):
s = context.wrap_socket(s, do_handshake_on_connect=True)
except ssl.SSLError as e:
self.print_error(e)
s = None
except:
return
try:
peer_cert = s.getpeercert()
except OSError:
return
if s and self.check_host_name(peer_cert, self.host):
self.print_error("SSL certificate signed by CA")
return s
else:
try:
peer_cert = s.getpeercert()
except OSError:
return
if self.check_host_name(peer_cert, self.host):
self.print_error("SSL certificate signed by CA")
return s
# get server certificate.
# Do not use ssl.get_server_certificate because it does not work with proxy
s = self.get_simple_socket()