bpo-31429: Define TLS cipher suite on build time #3532
Merged
Conversation
This file contains 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
tiran
added
type-feature
|
Is there any way I can help move this forward? |
|
I'm not yet sure this patch can land in 3.7. LibreSSL is messing up my plans. |
tiran
force-pushed
the
bpo-31429-cipher-suite
branch
from
c111937
to
4f4c506
Compare
tiran
changed the title
|
This PR can be merged after #3462 has landed or we forcefully unsupport OpenSSL < 1.0.2. |
tiran
force-pushed
the
bpo-31429-cipher-suite
branch
from
4f4c506
to
b33e892
Compare
tiran
force-pushed
the
bpo-31429-cipher-suite
branch
2 times, most recently
from
fddbdb2
to
236097d
Compare
|
@ned-deily Fedora upstream would love have this PR in 3.7. It's also going to make your life as 3.7 security maintainer easier. |
alex
reviewed
Jan 28, 2018
Lib/ssl.py
Outdated
| @@ -531,7 +489,7 @@ def create_default_context(purpose=Purpose.SERVER_AUTH, *, cafile=None, | |||
| context.verify_mode = CERT_REQUIRED | |||
| context.check_hostname = True | |||
| elif purpose == Purpose.CLIENT_AUTH: | |||
| context.set_ciphers(_RESTRICTED_SERVER_CIPHERS) | |||
| pass | |||
There was a problem hiding this comment.
You can just remove this elif block entirely :-)
| @@ -0,0 +1 @@ | |||
| [WIP] Add --with-ssl-default-suites | |||
There was a problem hiding this comment.
Probably needs the WIP removed :-)
There was a problem hiding this comment.
Oh, I forgot to update the old blurb. I have created a new one and also added 3.7 whatsnew.
Modules/_ssl.c
Outdated
| @@ -74,6 +74,10 @@ static PySocketModule_APIObject PySocketModule; | |||
| # endif | |||
| #endif | |||
|
|
|||
| #if OPENSSL_VERSION_NUMBER < 0x1000200fL | |||
There was a problem hiding this comment.
Is this still needed after the other change to require 1.0.2?
There was a problem hiding this comment.
Not really, I added it for doubleplusgood paranoia reasons and just removed it.
tiran
force-pushed
the
bpo-31429-cipher-suite
branch
2 times, most recently
from
ed16875
to
724de80
Compare
Until now Python used a hard coded white list of default TLS cipher suites. The old approach has multiple downsides. OpenSSL's default selection was completely overruled. Python did neither benefit from new cipher suites (ChaCha20, TLS 1.3 suites) nor blacklisted cipher suites. For example we used to re-enable 3DES. Python now defaults to OpenSSL DEFAULT cipher suite selection and black lists all unwanted ciphers. Downstream vendors can override the default cipher list with --with-ssl-default-suites. Signed-off-by: Christian Heimes <christian@python.org>
tiran
force-pushed
the
bpo-31429-cipher-suite
branch
from
724de80
to
ea6427f
Compare
pitrou
approved these changes
Jan 29, 2018
|
@tiran: Please replace |
sfackler
added a commit
to sfackler/rust-openssl
that referenced
this pull request
Feb 21, 2018
Based off of python/cpython#3532, we use OpenSSL's default cipher list and turn of things we don't like. This can't be used with 1.0.1, however, which had a poor default set. There, we use the old defaults, with the bits that aren't implemented in 1.0.1 removed (namely TLSv1.3 suites and ChaCha).
sfackler
added a commit
to sfackler/rust-openssl
that referenced
this pull request
Feb 21, 2018
Based off of python/cpython#3532, we use OpenSSL's default cipher list and turn of things we don't like. This can't be used with 1.0.1, however, which had a poor default set. There, we use the old defaults, with the bits that aren't implemented in 1.0.1 removed (namely TLSv1.3 suites and ChaCha).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Until now Python used a hard coded white list of default TLS cipher
suites. The old approach has multiple downsides. OpenSSL's default
selection was completely overruled. Python did neither benefit from new
cipher suites (ChaCha20, TLS 1.3 suites) nor blacklisted cipher suites.
For example we used to re-enable 3DES.
Python now defaults to OpenSSL DEFAULT cipher suite selection and black
lists all unwanted ciphers. Downstream vendors can override the default
cipher list with --with-ssl-default-suites.
Signed-off-by: Christian Heimes christian@python.org
https://bugs.python.org/issue31429