diff options
author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2021-03-21 15:32:19 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-21 15:32:19 (GMT) |
commit | 93b0da7527ae1b7d705052cf352ef9da81e608ec (patch) | |
tree | 416e8eb788a416cdcbbfde4580cff75bca40423d /Misc | |
parent | 50511677f59464e612cfef0cd0e139fe07e87737 (diff) | |
download | cpython-93b0da7527ae1b7d705052cf352ef9da81e608ec.zip cpython-93b0da7527ae1b7d705052cf352ef9da81e608ec.tar.gz cpython-93b0da7527ae1b7d705052cf352ef9da81e608ec.tar.bz2 |
bpo-43577: Fix deadlock with SSLContext._msg_callback and sni_callback (GH-24957)
OpenSSL copies the internal message callback from SSL_CTX->msg_callback to
SSL->msg_callback. SSL_set_SSL_CTX() does not update SSL->msg_callback
to use the callback value of the new context.
PySSL_set_context() now resets the callback and _PySSL_msg_callback()
resets thread state in error path.
Signed-off-by: Christian Heimes <christian@python.org>
(cherry picked from commit 77cde5042a2f1eae489c11a67540afaf43cd5cdf)
Co-authored-by: Christian Heimes <christian@python.org>
Diffstat (limited to 'Misc')
-rw-r--r-- | Misc/NEWS.d/next/Library/2021-03-21-10-13-17.bpo-43577.m7JnAV.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Misc/NEWS.d/next/Library/2021-03-21-10-13-17.bpo-43577.m7JnAV.rst b/Misc/NEWS.d/next/Library/2021-03-21-10-13-17.bpo-43577.m7JnAV.rst new file mode 100644 index 0000000..a7db48b --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-03-21-10-13-17.bpo-43577.m7JnAV.rst @@ -0,0 +1 @@ +Fix deadlock when using :class:`ssl.SSLContext` debug callback with :meth:`ssl.SSLContext.sni_callback`. |