maverick/postgres-mitm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

merge into: maverick:master
Branches Tags
maverick:master
maverick:osx
...
pull from: maverick:osx
Branches Tags
maverick:master
maverick:osx
Sign in to create a new pull request.

1 commit
master ... osx

Author SHA1 Message Date
Tarjei Husøy
a8000b9e99 Specify ssl cipher list 
Apparently needed on OSX (openssl 1.0.2h).
 2016-06-02 12:12:23 -07:00
1 changed files with 18 additions and 1 deletions
Show stats Expand all files Collapse all files

19
postgres_mitm.py
View file

@ -326,7 +326,8 @@ class ClientConnection(threading.Thread):
def listen_for_tls_handshake(self): def listen_for_tls_handshake(self):
self.socket = self.ssl_context.wrap_socket(self.socket, server_side=True) self.socket = self.ssl_context.wrap_socket(self.socket,
server_side=True, ciphers=get_cipher_list())
def terminate(self): def terminate(self):
@ -343,6 +344,22 @@ class ClientConnection(threading.Thread):
self.stop() self.stop()
def get_cipher_list():
# This is the Mozilla modern cipher suite as of 2016-05-30
# https://wiki.mozilla.org/Security/Server_Side_TLS#Modern_compatibility
return ':'.join((
'ECDHE-ECDSA-AES256-GCM-SHA384',
'ECDHE-RSA-AES256-GCM-SHA384',
'ECDHE-ECDSA-CHACHA20-POLY1305',
'ECDHE-RSA-CHACHA20-POLY1305',
'ECDHE-ECDSA-AES128-GCM-SHA256',
'ECDHE-RSA-AES128-GCM-SHA256',
'ECDHE-ECDSA-AES256-SHA384',
'ECDHE-RSA-AES256-SHA384',
'ECDHE-ECDSA-AES128-SHA256',
'ECDHE-RSA-AES128-SHA256',
))
def socket_is_closed(sock): def socket_is_closed(sock):
return isinstance(sock._sock, socket._closedsocket) return isinstance(sock._sock, socket._closedsocket)