Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bpo-44362: ssl: improve deprecation warnings and docs (GH-26646) #26646

Merged
merged 1 commit into from
Jun 11, 2021

Conversation

tiran
Copy link
Member

@tiran tiran commented Jun 10, 2021

Signed-off-by: Christian Heimes [email protected]

https://bugs.python.org/issue44362

@tiran tiran added docs Documentation in the Doc dir needs backport to 3.10 only security fixes labels Jun 10, 2021
Modules/_ssl.c Outdated
@@ -3583,7 +3593,7 @@ set_options(PySSLContext *self, PyObject *arg, void *c)
set = ~opts & new_opts;

if ((set & opt_no) != 0) {
if (_ssl_deprecated("Setting OP_NO_SSL* or SSL_NO_TLS* options is "
if (_ssl_deprecated("Setting OP_NO_SSL*/ssl.SSL_NO_TLS* options is "
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (_ssl_deprecated("Setting OP_NO_SSL*/ssl.SSL_NO_TLS* options is "
if (_ssl_deprecated("Setting ssl.OP_NO_SSL*/ssl.SSL_NO_TLS* options is "

@tiran tiran force-pushed the bpo-44362-ssl-depr branch from f656ee3 to 24096d7 Compare June 10, 2021 18:42
@tiran tiran added the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Jun 10, 2021
@bedevere-bot
Copy link

🤖 New build scheduled with the buildbot fleet by @tiran for commit 24096d7 🤖

If you want to schedule another build, you need to add the ":hammer: test-with-buildbots" label again.

@bedevere-bot bedevere-bot removed the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Jun 10, 2021
@tiran tiran changed the title bpo-44362: ssl: improve deprecation warnings and docs bpo-44362: ssl: improve deprecation warnings and docs (GH-26646) Jun 11, 2021
@tiran tiran merged commit e26014f into python:main Jun 11, 2021
@tiran tiran deleted the bpo-44362-ssl-depr branch June 11, 2021 07:15
@miss-islington
Copy link
Contributor

Thanks @tiran for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 11, 2021
Signed-off-by: Christian Heimes <[email protected]>
(cherry picked from commit e26014f)

Co-authored-by: Christian Heimes <[email protected]>
@bedevere-bot
Copy link

GH-26665 is a backport of this pull request to the 3.10 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Jun 11, 2021
miss-islington added a commit that referenced this pull request Jun 11, 2021
Signed-off-by: Christian Heimes <[email protected]>
(cherry picked from commit e26014f)

Co-authored-by: Christian Heimes <[email protected]>
pquentin added a commit to elastic/rally that referenced this pull request May 19, 2022
Rally is a client, so its purpose is to authenticate servers. This means
that we should use ssl.Purpose.SERVER_AUTH instead of CLIENT_AUTH, with
or without client certs. This is super confusing, see
python/cpython#73996. Anyway, in 3.10 making this mistake isn't possible
anymore due python/cpython#26646.
    
To make sure this does not break in the future, we also add tests for
the IP and client certs cases.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs Documentation in the Doc dir
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants