Remove keylog_bio patch, obsolete.

BoringSSL was originally missing BIO_FP_TEXT preventing the keylog callback API from working. That was added to BoringSSL.
gpshead · Mar 27, 2024 · 29fedb4 · 29fedb4
1 parent 1ca135c
commit 29fedb4
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
@@ -304,10 +304,8 @@ typedef struct {
     int post_handshake_auth;
 #endif
     PyObject *msg_cb;
-#ifndef OPENSSL_IS_BORINGSSL
     PyObject *keylog_filename;
     BIO *keylog_bio;
-#endif
     /* Cached module state, also used in SSLSocket and SSLSession code. */
     _sslmodulestate *state;
 #ifndef OPENSSL_NO_PSK
@@ -3142,10 +3140,8 @@ _ssl__SSLContext_impl(PyTypeObject *type, int proto_version)
     self->hostflags = X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS;
     self->protocol = proto_version;
     self->msg_cb = NULL;
-#ifndef OPENSSL_IS_BORINGSSL
     self->keylog_filename = NULL;
     self->keylog_bio = NULL;
-#endif
     self->alpn_protocols = NULL;
     self->set_sni_cb = NULL;
     self->state = get_ssl_state(module);
@@ -3265,7 +3261,6 @@ context_clear(PySSLContext *self)
 {
     Py_CLEAR(self->set_sni_cb);
     Py_CLEAR(self->msg_cb);
-#ifndef OPENSSL_IS_BORINGSSL
     Py_CLEAR(self->keylog_filename);
 #ifndef OPENSSL_NO_PSK
     Py_CLEAR(self->psk_client_callback);
@@ -3277,7 +3272,6 @@ context_clear(PySSLContext *self)
         PySSL_END_ALLOW_THREADS
         self->keylog_bio = NULL;
     }
-#endif
     return 0;
 }
 
@@ -4946,10 +4940,8 @@ static PyGetSetDef context_getsetlist[] = {
                         (setter) set_minimum_version, NULL},
     {"maximum_version", (getter) get_maximum_version,
                         (setter) set_maximum_version, NULL},
-#ifndef OPENSSL_IS_BORINGSSL
     {"keylog_filename", (getter) _PySSLContext_get_keylog_filename,
                         (setter) _PySSLContext_set_keylog_filename, NULL},
-#endif
     {"_msg_callback", (getter) _PySSLContext_get_msg_callback,
                       (setter) _PySSLContext_set_msg_callback, NULL},
     {"sni_callback", (getter) get_sni_callback,

diff --git a/Modules/_ssl/debughelpers.c b/Modules/_ssl/debughelpers.c
@@ -112,7 +112,6 @@ _PySSLContext_set_msg_callback(PySSLContext *self, PyObject *arg, void *c) {
     return 0;
 }
 
-#ifndef OPENSSL_IS_BORINGSSL
 static void
 _PySSL_keylog_callback(const SSL *ssl, const char *line)
 {
@@ -205,4 +204,3 @@ _PySSLContext_set_keylog_filename(PySSLContext *self, PyObject *arg, void *c) {
     SSL_CTX_set_keylog_callback(self->ctx, _PySSL_keylog_callback);
     return 0;
 }
-#endif  /* OPENSSL_IS_BORINGSSL */