[3.8] bpo-43577: Fix deadlock with SSLContext._msg_callback and sni_callback (GH-24957)#24959
Merged
miss-islington merged 1 commit intoMar 21, 2021
python:3.8python/cpython:3.8from
miss-islington:backport-77cde50-3.8miss-islington/cpython:backport-77cde50-3.8Copy head branch name to clipboard
Merged
[3.8] bpo-43577: Fix deadlock with SSLContext._msg_callback and sni_callback (GH-24957)#24959miss-islington merged 1 commit intopython:3.8python/cpython:3.8from miss-islington:backport-77cde50-3.8miss-islington/cpython:backport-77cde50-3.8Copy head branch name to clipboard
miss-islington merged 1 commit into
python:3.8python/cpython:3.8from
miss-islington:backport-77cde50-3.8miss-islington/cpython:backport-77cde50-3.8Copy head branch name to clipboard
Conversation
pythonGH-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 77cde50) Co-authored-by: Christian Heimes <christian@python.org>
Contributor
Author
|
@tiran: Status check is done, and it's a success ✅ . |
tiran
approved these changes
Mar 21, 2021
Contributor
Author
|
@tiran: Status check is done, and it's a success ✅ . |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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 77cde50)
Co-authored-by: Christian Heimes christian@python.org
https://bugs.python.org/issue43577
Automerge-Triggered-By: GH:tiran