Skip to content

Commit cea04a6

Browse files
Replace OPENSSL_NO_TLS_PHA with SSL_VERIFY_POST_HANDSHAKE (#1668)
PR #1526 introduced the `OPENSSL_NO_TLS_PHA` directive mostly for the purposes of AWS-LC's compatibility with CPython, but in [cpython PR #117785](python/cpython#117785) @encukou points out that detecting the absence of OpenSSL's own `SSL_VERIFY_POST_HANDSHAKE` directive is sufficient. This change removes AWS-LC's `OPENSSL_NO_TLS_PHA` directive in favor of detecting absence of `SSL_VERIFY_POST_HANDSHAKE`.
1 parent b2bbd9c commit cea04a6

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

include/openssl/opensslconf.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@ extern "C" {
5353
#define OPENSSL_NO_MD2
5454
#define OPENSSL_NO_MDC2
5555
#define OPENSSL_NO_OCB
56-
57-
// OPENSSL_NO_TLS_PHA indicates lack of support for post-handshake
58-
// authentication (PHA) in TLS >= 1.3
59-
#define OPENSSL_NO_TLS_PHA
60-
6156
#define OPENSSL_NO_RC2
6257
#define OPENSSL_NO_RC5
6358
#define OPENSSL_NO_RFC3779

tests/ci/integration/python_patch/3.13/aws-lc-cpython.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ index f7fdbf4..204d501 100644
147147
#endif
148148

149149

150-
+#if defined(OPENSSL_NO_TLS_PHA) || !defined(TLS1_3_VERSION) || defined(OPENSSL_NO_TLS1_3)
150+
+#if !defined(SSL_VERIFY_POST_HANDSHAKE) || !defined(TLS1_3_VERSION) || defined(OPENSSL_NO_TLS1_3)
151151
+ #define PY_SSL_NO_POST_HS_AUTH
152152
+#endif
153153
+

tests/ci/integration/python_patch/main/aws-lc-cpython.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ index f7fdbf4..204d501 100644
147147
#endif
148148

149149

150-
+#if defined(OPENSSL_NO_TLS_PHA) || !defined(TLS1_3_VERSION) || defined(OPENSSL_NO_TLS1_3)
150+
+#if !defined(SSL_VERIFY_POST_HANDSHAKE) || !defined(TLS1_3_VERSION) || defined(OPENSSL_NO_TLS1_3)
151151
+ #define PY_SSL_NO_POST_HS_AUTH
152152
+#endif
153153
+

0 commit comments

Comments
 (0)