BTCPrivate
/
-WIP-electrum-btcp
mirror of https://github.com/BTCPrivate/-WIP-electrum-btcp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use ssl.PROTOCOL_SSLv23

This commit is contained in:
ThomasV 2014-10-31 14:59:59 +01:00
parent c5636be03a
commit c225795793
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/interface.py
View File

@ -173,7 +173,7 @@ class TcpInterface(threading.Thread):
return return
# try with CA first # try with CA first
try: try:
s = ssl.wrap_socket(s, ssl_version=ssl.PROTOCOL_SSLv3, 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):
@ -184,7 +184,7 @@ class TcpInterface(threading.Thread):
# Do not use ssl.get_server_certificate because it does not work with proxy # Do not use ssl.get_server_certificate because it does not work with proxy
s = self.get_simple_socket() s = self.get_simple_socket()
try: try:
s = ssl.wrap_socket(s, ssl_version=ssl.PROTOCOL_SSLv3, 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:
print_error("SSL error retrieving SSL certificate:", self.host, e) print_error("SSL error retrieving SSL certificate:", self.host, e)
return return
@ -210,7 +210,7 @@ class TcpInterface(threading.Thread):
if self.use_ssl: if self.use_ssl:
try: try:
s = ssl.wrap_socket(s, s = ssl.wrap_socket(s,
ssl_version=ssl.PROTOCOL_SSLv3, 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)