Bitmessage/MiNode
3
0
Fork 1
Code Pull Requests 9 Actions Activity

TLS updates

Browse Source
This commit is contained in:
TheKysek 2017-06-25 10:29:46 +02:00
parent 55e263a394
commit 02af66b976
No known key found for this signature in database
GPG Key ID: 50D9AF00D0B1C497
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
minode/connection.py
View File

@ -148,12 +148,16 @@ class Connection(threading.Thread):
def _do_tls_handshake(self): def _do_tls_handshake(self):
logging.debug('Initializing TLS connection with {}:{}'.format(self.host_print, self.port)) logging.debug('Initializing TLS connection with {}:{}'.format(self.host_print, self.port))
self.s = ssl.wrap_socket(self.s, keyfile=os.path.join(shared.source_directory, 'tls', 'key.pem'),
certfile=os.path.join(shared.source_directory, 'tls', 'cert.pem'), context = ssl.create_default_context()
server_side=self.server, ssl_version=ssl.PROTOCOL_TLSv1, do_handshake_on_connect=False, context.check_hostname = False
ciphers='AECDH-AES256-SHA', suppress_ragged_eofs=True) context.verify_mode = ssl.CERT_NONE
if hasattr(self.s, "context"): context.set_ciphers('AECDH-AES256-SHA')
self.s.context.set_ecdh_curve("secp256k1") context.set_ecdh_curve("secp256k1")
context.options = ssl.OP_ALL | ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3 | ssl.OP_SINGLE_ECDH_USE | ssl.OP_CIPHER_SERVER_PREFERENCE
self.s = context.wrap_socket(self.s, server_side=self.server, do_handshake_on_connect=False)
while True: while True:
try: try:
self.s.do_handshake() self.s.do_handshake()
@ -167,7 +171,7 @@ class Connection(threading.Thread):
self.status = 'disconnecting' self.status = 'disconnecting'
break break
self.tls = True self.tls = True
logging.debug('Established TLS connection with {}:{}'.format(self.host_print, self.port)) logging.debug('Established {} connection with {}:{}'.format(self.s.version(), self.host_print, self.port))
def _send_message(self, m): def _send_message(self, m):
if type(m) == message.Message and m.command == b'object': if type(m) == message.Message and m.command == b'object':