-
-
Notifications
You must be signed in to change notification settings - Fork 32.7k
gh-137197: Add SSLContext.set_ciphersuites to set TLS 1.3 ciphers #137198
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.
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
Changes from all commits
5a1cc22
09534fd
6783fe6
d3375f1
48e5164
11b760e
eaae575
e09017f
caf6675
fe8791d
4566478
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -263,7 +263,9 @@ def utc_offset(): #NOTE: ignore issues like #1647654 | |
|
||
def test_wrap_socket(sock, *, | ||
cert_reqs=ssl.CERT_NONE, ca_certs=None, | ||
ciphers=None, certfile=None, keyfile=None, | ||
ciphers=None, ciphersuites=None, | ||
min_version=None, max_version=None, | ||
certfile=None, keyfile=None, | ||
**kwargs): | ||
if not kwargs.get("server_side"): | ||
kwargs["server_hostname"] = SIGNED_CERTFILE_HOSTNAME | ||
|
@@ -280,6 +282,12 @@ def test_wrap_socket(sock, *, | |
context.load_cert_chain(certfile, keyfile) | ||
if ciphers is not None: | ||
context.set_ciphers(ciphers) | ||
if ciphersuites is not None: | ||
context.set_ciphersuites(ciphersuites) | ||
if min_version is not None: | ||
context.minimum_version = min_version | ||
if max_version is not None: | ||
context.maximum_version = max_version | ||
return context.wrap_socket(sock, **kwargs) | ||
|
||
|
||
|
@@ -2238,6 +2246,68 @@ def test_transport_eof(self): | |
self.assertRaises(ssl.SSLEOFError, sslobj.read) | ||
|
||
|
||
@unittest.skipUnless(has_tls_version('TLSv1_3'), "TLS 1.3 is not available") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Note to myself: change the |
||
class SimpleBackgroundTestsTLS_1_3(unittest.TestCase): | ||
"""Tests that connect to a simple server running in the background.""" | ||
|
||
def setUp(self): | ||
server_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER) | ||
ciphers = [cipher['name'] for cipher in server_ctx.get_ciphers() | ||
if cipher['protocol'] == 'TLSv1.3'] | ||
|
||
if not ciphers: | ||
self.skipTest("No cipher supports TLSv1.3") | ||
|
||
self.matching_cipher = ciphers[0] | ||
# Some tests need at least two ciphers, and are responsible | ||
# to skip themselves if matching_cipher == mismatched_cipher. | ||
self.mismatched_cipher = ciphers[-1] | ||
|
||
server_ctx.set_ciphersuites(self.matching_cipher) | ||
server_ctx.load_cert_chain(SIGNED_CERTFILE) | ||
server = ThreadedEchoServer(context=server_ctx) | ||
self.enterContext(server) | ||
self.server_addr = (HOST, server.port) | ||
|
||
def test_ciphersuites(self): | ||
# Test unrecognized TLS 1.3 cipher suite name | ||
with ( | ||
socket.socket(socket.AF_INET) as sock, | ||
self.assertRaisesRegex(ssl.SSLError, | ||
"No cipher suite can be selected") | ||
): | ||
test_wrap_socket(sock, cert_reqs=ssl.CERT_NONE, | ||
ciphersuites="XXX", | ||
min_version=ssl.TLSVersion.TLSv1_3) | ||
|
||
# Test successful TLS 1.3 handshake | ||
with test_wrap_socket(socket.socket(socket.AF_INET), | ||
cert_reqs=ssl.CERT_NONE, | ||
ciphersuites=self.matching_cipher, | ||
min_version=ssl.TLSVersion.TLSv1_3) as s: | ||
s.connect(self.server_addr) | ||
self.assertEqual(s.cipher()[0], self.matching_cipher) | ||
|
||
def test_ciphersuite_downgrade(self): | ||
with test_wrap_socket(socket.socket(socket.AF_INET), | ||
cert_reqs=ssl.CERT_NONE, | ||
ciphersuites=self.matching_cipher, | ||
min_version=ssl.TLSVersion.TLSv1_2, | ||
max_version=ssl.TLSVersion.TLSv1_2) as s: | ||
s.connect(self.server_addr) | ||
self.assertEqual(s.cipher()[1], 'TLSv1.2') | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This test is asserting that the default |
||
|
||
def test_ciphersuite_mismatch(self): | ||
if self.matching_cipher == self.mismatched_cipher: | ||
self.skipTest("Multiple TLS 1.3 ciphers are not available") | ||
picnixz marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
with test_wrap_socket(socket.socket(socket.AF_INET), | ||
cert_reqs=ssl.CERT_NONE, | ||
ciphersuites=self.mismatched_cipher, | ||
min_version=ssl.TLSVersion.TLSv1_3) as s: | ||
self.assertRaises(ssl.SSLError, s.connect, self.server_addr) | ||
|
||
|
||
@support.requires_resource('network') | ||
class NetworkedTests(unittest.TestCase): | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
:class:`~ssl.SSLContext` objects can now set TLS 1.3 cipher suites | ||
via :meth:`~ssl.SSLContext.set_ciphersuites`. |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Uh oh!
There was an error while loading. Please reload this page.