Revert "Use ssl.PROTOCOL_TLSv1 on client side to avoid SSLv23"
This reverts commit 4731418af9
.
This commit is contained in:
parent
97568bedf5
commit
614f3df4b8
|
@ -117,7 +117,7 @@ class TcpConnection(threading.Thread, util.PrintError):
|
||||||
return
|
return
|
||||||
# try with CA first
|
# try with CA first
|
||||||
try:
|
try:
|
||||||
s = ssl.wrap_socket(s, ssl_version=ssl.PROTOCOL_TLSv1, cert_reqs=ssl.CERT_REQUIRED, ca_certs=ca_path, do_handshake_on_connect=True)
|
s = ssl.wrap_socket(s, ssl_version=ssl.PROTOCOL_SSLv23, cert_reqs=ssl.CERT_REQUIRED, ca_certs=ca_path, do_handshake_on_connect=True)
|
||||||
except ssl.SSLError, e:
|
except ssl.SSLError, e:
|
||||||
s = None
|
s = None
|
||||||
if s and self.check_host_name(s.getpeercert(), self.host):
|
if s and self.check_host_name(s.getpeercert(), self.host):
|
||||||
|
@ -130,7 +130,7 @@ class TcpConnection(threading.Thread, util.PrintError):
|
||||||
if s is None:
|
if s is None:
|
||||||
return
|
return
|
||||||
try:
|
try:
|
||||||
s = ssl.wrap_socket(s, ssl_version=ssl.PROTOCOL_TLSv1, cert_reqs=ssl.CERT_NONE, ca_certs=None)
|
s = ssl.wrap_socket(s, ssl_version=ssl.PROTOCOL_SSLv23, cert_reqs=ssl.CERT_NONE, ca_certs=None)
|
||||||
except ssl.SSLError, e:
|
except ssl.SSLError, e:
|
||||||
self.print_error("SSL error retrieving SSL certificate:", e)
|
self.print_error("SSL error retrieving SSL certificate:", e)
|
||||||
return
|
return
|
||||||
|
@ -153,7 +153,7 @@ class TcpConnection(threading.Thread, util.PrintError):
|
||||||
if self.use_ssl:
|
if self.use_ssl:
|
||||||
try:
|
try:
|
||||||
s = ssl.wrap_socket(s,
|
s = ssl.wrap_socket(s,
|
||||||
ssl_version=ssl.PROTOCOL_TLSv1,
|
ssl_version=ssl.PROTOCOL_SSLv23,
|
||||||
cert_reqs=ssl.CERT_REQUIRED,
|
cert_reqs=ssl.CERT_REQUIRED,
|
||||||
ca_certs= (temporary_path if is_new else cert_path),
|
ca_certs= (temporary_path if is_new else cert_path),
|
||||||
do_handshake_on_connect=True)
|
do_handshake_on_connect=True)
|
||||||
|
|
Loading…
Reference in New Issue