diff options
| author | David Benjamin <davidben@google.com> | 2023-12-26 21:35:41 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-26 21:35:41 (GMT) |
| commit | af2b8f6845e31dd6ab3bb0bac41b19a0e023fd61 (patch) | |
| tree | 48461c96900b9c613ffa2a6af604b736b0fc9691 | |
| parent | 2b53c767de0a7afd29598a87da084d0e125e1c34 (diff) | |
| download | cpython-af2b8f6845e31dd6ab3bb0bac41b19a0e023fd61.zip cpython-af2b8f6845e31dd6ab3bb0bac41b19a0e023fd61.tar.gz cpython-af2b8f6845e31dd6ab3bb0bac41b19a0e023fd61.tar.bz2 | |
gh-113332: Simplify calls to SSL_(CTX_)set_verify in _ssl.c (#113333)
_ssl.c currently tries to preserve the verification callback, but at no
point does it ever set one. Just pass in NULL.
| -rw-r--r-- | Modules/_ssl.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 90b600f..04c9f7d 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -893,10 +893,8 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock, * only in combination with SSL_VERIFY_PEER flag. */ int mode = SSL_get_verify_mode(self->ssl); if (mode & SSL_VERIFY_PEER) { - int (*verify_cb)(int, X509_STORE_CTX *) = NULL; - verify_cb = SSL_get_verify_callback(self->ssl); mode |= SSL_VERIFY_POST_HANDSHAKE; - SSL_set_verify(self->ssl, mode, verify_cb); + SSL_set_verify(self->ssl, mode, NULL); } } else { /* client socket */ @@ -2997,7 +2995,6 @@ static int _set_verify_mode(PySSLContext *self, enum py_ssl_cert_requirements n) { int mode; - int (*verify_cb)(int, X509_STORE_CTX *) = NULL; switch(n) { case PY_SSL_CERT_NONE: @@ -3018,9 +3015,7 @@ _set_verify_mode(PySSLContext *self, enum py_ssl_cert_requirements n) /* bpo-37428: newPySSLSocket() sets SSL_VERIFY_POST_HANDSHAKE flag for * server sockets and SSL_set_post_handshake_auth() for client. */ - /* keep current verify cb */ - verify_cb = SSL_CTX_get_verify_callback(self->ctx); - SSL_CTX_set_verify(self->ctx, mode, verify_cb); + SSL_CTX_set_verify(self->ctx, mode, NULL); return 0; } |