Skip to content

Commit cd061a4

Browse files
Remove python CI patch for main (#2407)
As of [PR 133624](python/cpython#133624), CPython's mainline is now fully source- and test-compatible with AWS-LC. This means that we can reduce our CI patch file to a static build configuration.
1 parent 7c6ad87 commit cd061a4

File tree

1 file changed

+0
-42
lines changed

1 file changed

+0
-42
lines changed
Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,3 @@
1-
diff --git a/Lib/ssl.py b/Lib/ssl.py
2-
index 05df4ad..7e3c4cb 100644
3-
--- a/Lib/ssl.py
4-
+++ b/Lib/ssl.py
5-
@@ -116,7 +116,7 @@
6-
7-
from _ssl import (
8-
HAS_SNI, HAS_ECDH, HAS_NPN, HAS_ALPN, HAS_SSLv2, HAS_SSLv3, HAS_TLSv1,
9-
- HAS_TLSv1_1, HAS_TLSv1_2, HAS_TLSv1_3, HAS_PSK, HAS_PHA
10-
+ HAS_TLSv1_1, HAS_TLSv1_2, HAS_TLSv1_3, HAS_PSK, HAS_PSK_TLS13, HAS_PHA
11-
)
12-
from _ssl import _DEFAULT_CIPHERS, _OPENSSL_API_VERSION
13-
14-
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
15-
index 395b2ef..c168224 100644
16-
--- a/Lib/test/test_ssl.py
17-
+++ b/Lib/test/test_ssl.py
18-
@@ -4488,6 +4488,7 @@ def server_callback(identity):
19-
20-
@requires_tls_version('TLSv1_3')
21-
@unittest.skipUnless(ssl.HAS_PSK, 'TLS-PSK disabled on this OpenSSL build')
22-
+ @unittest.skipUnless(ssl.HAS_PSK_TLS13, 'TLS 1.3 PSK disabled on this OpenSSL build')
23-
def test_psk_tls1_3(self):
24-
psk = bytes.fromhex('deadbeef')
25-
identity_hint = 'identity-hint'
261
diff --git a/Modules/Setup b/Modules/Setup
272
index a066982..3d7fbc3 100644
283
--- a/Modules/Setup
@@ -44,20 +19,3 @@ index a066982..3d7fbc3 100644
4419

4520
# The _tkinter module.
4621
#
47-
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
48-
index 97a29f4..3f2f55e 100644
49-
--- a/Modules/_ssl.c
50-
+++ b/Modules/_ssl.c
51-
@@ -6626,6 +6626,12 @@ sslmodule_init_constants(PyObject *m)
52-
addbool(m, "HAS_PSK", 1);
53-
#endif
54-
55-
+#ifdef OPENSSL_NO_EXTERNAL_PSK_TLS13
56-
+ addbool(m, "HAS_PSK_TLS13", 0);
57-
+#else
58-
+ addbool(m, "HAS_PSK_TLS13", 1);
59-
+#endif
60-
+
61-
#ifdef SSL_VERIFY_POST_HANDSHAKE
62-
addbool(m, "HAS_PHA", 1);
63-
#else

0 commit comments

Comments
 (0)