diff --git a/tests/ci/integration/python_patch/main/aws-lc-cpython.patch b/tests/ci/integration/python_patch/main/aws-lc-cpython.patch index bc4b358160..724fbf3fd9 100644 --- a/tests/ci/integration/python_patch/main/aws-lc-cpython.patch +++ b/tests/ci/integration/python_patch/main/aws-lc-cpython.patch @@ -139,124 +139,3 @@ index cd1cf24..53bcc4c 100644 # The _tkinter module. # -diff --git a/Modules/_ssl.c b/Modules/_ssl.c -index f7fdbf4..204d501 100644 ---- a/Modules/_ssl.c -+++ b/Modules/_ssl.c -@@ -187,6 +187,11 @@ extern const SSL_METHOD *TLSv1_2_method(void); - #endif - - -+#if !defined(SSL_VERIFY_POST_HANDSHAKE) || !defined(TLS1_3_VERSION) || defined(OPENSSL_NO_TLS1_3) -+ #define PY_SSL_NO_POST_HS_AUTH -+#endif -+ -+ - enum py_ssl_error { - /* these mirror ssl.h */ - PY_SSL_ERROR_NONE, -@@ -231,7 +236,7 @@ enum py_proto_version { - PY_PROTO_TLSv1 = TLS1_VERSION, - PY_PROTO_TLSv1_1 = TLS1_1_VERSION, - PY_PROTO_TLSv1_2 = TLS1_2_VERSION, --#ifdef TLS1_3_VERSION -+#if defined(TLS1_3_VERSION) - PY_PROTO_TLSv1_3 = TLS1_3_VERSION, - #else - PY_PROTO_TLSv1_3 = 0x304, -@@ -293,7 +298,7 @@ typedef struct { - */ - unsigned int hostflags; - int protocol; --#ifdef TLS1_3_VERSION -+#if !defined(PY_SSL_NO_POST_HS_AUTH) - int post_handshake_auth; - #endif - PyObject *msg_cb; -@@ -873,7 +878,7 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock, - SSL_set_mode(self->ssl, - SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER | SSL_MODE_AUTO_RETRY); - --#ifdef TLS1_3_VERSION -+#if !defined(PY_SSL_NO_POST_HS_AUTH) - if (sslctx->post_handshake_auth == 1) { - if (socket_type == PY_SSL_SERVER) { - /* bpo-37428: OpenSSL does not ignore SSL_VERIFY_POST_HANDSHAKE. -@@ -1016,6 +1021,7 @@ _ssl__SSLSocket_do_handshake_impl(PySSLSocket *self) - } while (err.ssl == SSL_ERROR_WANT_READ || - err.ssl == SSL_ERROR_WANT_WRITE); - Py_XDECREF(sock); -+ - if (ret < 1) - return PySSL_SetError(self, __FILE__, __LINE__); - if (PySSL_ChainExceptions(self) < 0) -@@ -2775,7 +2781,7 @@ static PyObject * - _ssl__SSLSocket_verify_client_post_handshake_impl(PySSLSocket *self) - /*[clinic end generated code: output=532147f3b1341425 input=6bfa874810a3d889]*/ - { --#ifdef TLS1_3_VERSION -+#if !defined(PY_SSL_NO_POST_HS_AUTH) - int err = SSL_verify_client_post_handshake(self->ssl); - if (err == 0) - return _setSSLError(get_state_sock(self), NULL, 0, __FILE__, __LINE__); -@@ -3198,7 +3204,7 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version) - X509_VERIFY_PARAM_set_flags(params, X509_V_FLAG_TRUSTED_FIRST); - X509_VERIFY_PARAM_set_hostflags(params, self->hostflags); - --#ifdef TLS1_3_VERSION -+#if !defined(PY_SSL_NO_POST_HS_AUTH) - self->post_handshake_auth = 0; - SSL_CTX_set_post_handshake_auth(self->ctx, self->post_handshake_auth); - #endif -@@ -3576,7 +3582,7 @@ set_maximum_version(PySSLContext *self, PyObject *arg, void *c) - return set_min_max_proto_version(self, arg, 1); - } - --#ifdef TLS1_3_VERSION -+#if defined(TLS1_3_VERSION) && !defined(OPENSSL_NO_TLS1_3) - static PyObject * - get_num_tickets(PySSLContext *self, void *c) - { -@@ -3607,7 +3613,7 @@ set_num_tickets(PySSLContext *self, PyObject *arg, void *c) - - PyDoc_STRVAR(PySSLContext_num_tickets_doc, - "Control the number of TLSv1.3 session tickets"); --#endif /* TLS1_3_VERSION */ -+#endif /* defined(TLS1_3_VERSION) */ - - static PyObject * - get_security_level(PySSLContext *self, void *c) -@@ -3710,14 +3716,14 @@ set_check_hostname(PySSLContext *self, PyObject *arg, void *c) - - static PyObject * - get_post_handshake_auth(PySSLContext *self, void *c) { --#if TLS1_3_VERSION -+#if !defined(PY_SSL_NO_POST_HS_AUTH) - return PyBool_FromLong(self->post_handshake_auth); - #else - Py_RETURN_NONE; - #endif - } - --#if TLS1_3_VERSION -+#if !defined(PY_SSL_NO_POST_HS_AUTH) - static int - set_post_handshake_auth(PySSLContext *self, PyObject *arg, void *c) { - if (arg == NULL) { -@@ -4959,14 +4965,14 @@ static PyGetSetDef context_getsetlist[] = { - (setter) _PySSLContext_set_msg_callback, NULL}, - {"sni_callback", (getter) get_sni_callback, - (setter) set_sni_callback, PySSLContext_sni_callback_doc}, --#ifdef TLS1_3_VERSION -+#if defined(TLS1_3_VERSION) && !defined(OPENSSL_NO_TLS1_3) - {"num_tickets", (getter) get_num_tickets, - (setter) set_num_tickets, PySSLContext_num_tickets_doc}, - #endif - {"options", (getter) get_options, - (setter) set_options, NULL}, - {"post_handshake_auth", (getter) get_post_handshake_auth, --#ifdef TLS1_3_VERSION -+#if !defined(PY_SSL_NO_POST_HS_AUTH) - (setter) set_post_handshake_auth, - #else - NULL,