Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Various TLS changes #193

Merged
merged 8 commits into from
Mar 25, 2020
Merged

Various TLS changes #193

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8be9331
Enable the MITM SSL Client (from MITM to RDP Server) to use TLS 1.2
Res260 Mar 18, 2020
23ff27c
Enable the MITM SSL Server (from RDP Client to MITM) to use TLS 1.2
Res260 Mar 18, 2020
52531cb
Enable any TLS version between client and MITM / MITM and server.
Res260 Mar 18, 2020
8c8a4da
lock pyopenssl version to minor to avoid breaking changes (see https:…
Res260 Mar 18, 2020
ee059d0
Disable TLS 1.3 to avoid future "impossible to decrypt" scenarios
Res260 Mar 18, 2020
338fe8e
Merge branch 'master' into tls1.2
Res260 Mar 24, 2020
e71df38
Merge branch 'master' into tls1.2
Res260 Mar 25, 2020
06c999c
lock pyopenssl to major instead of minor version
Res260 Mar 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions pyrdp/core/ssl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,16 @@ class ClientTLSContext(ssl.ClientContextFactory):
"""

def getContext(self):
context = SSL.Context(SSL.TLSv1_METHOD)
# Allow the MITM to connect to an RDP Server with ANY TLS version supported by the installed
# OpenSSL version. See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=784153
# It was removed from OpenSSL, but PyOpenSSL has not changed their constant names yet.
context = SSL.Context(SSL.SSLv23_METHOD)
context.set_options(SSL.OP_DONT_INSERT_EMPTY_FRAGMENTS)
context.set_options(SSL.OP_TLS_BLOCK_PADDING_BUG)

# We disable TLS 1.3 because the way to decrypt TLS 1.3 traffic differs from
# previous TLS versions and is not yet supported by PyRDP.
obilodeau marked this conversation as resolved.
Show resolved Hide resolved
context.set_options(SSL.OP_NO_TLSv1_3)
return context


Expand All @@ -47,5 +54,9 @@ def __init__(self, method):
self.set_options(SSL.OP_DONT_INSERT_EMPTY_FRAGMENTS)
self.set_options(SSL.OP_TLS_BLOCK_PADDING_BUG)

# See comment in ClientTLSContext
self.set_options(SSL.OP_NO_TLSv1_3)

# See comment in ClientTLSContext
ssl.DefaultOpenSSLContextFactory.__init__(self, privateKeyFileName, certificateFileName, SSL.SSLv23_METHOD,
TPDUSSLContext)
TPDUSSLContext)
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
'names',
'pyasn1',
'pycryptodome',
'pyopenssl',
'pyopenssl==19.1',
Res260 marked this conversation as resolved.
Show resolved Hide resolved
'pytz',
'rsa',
'service_identity',
Expand Down