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.

Sign up for GitHub

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

Jump to bottom

Restore context.set_ciphers() to create_urllib3_context() #1463

Merged
merged 6 commits into from Nov 1, 2018
Merged

Restore context.set_ciphers() to create_urllib3_context() #1463

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8c13211
Restore context.set_ciphers() to create_urllib3_context
sethmlarson Oct 23, 2018
280f53d
Update CHANGES.rst
sethmlarson Oct 23, 2018
6e2d616
Merge branch 'master' of https://github.com/urllib3/urllib3 into Seth…
sethmlarson Oct 25, 2018
3b26ecf
Add unit test for ciphers default and override
sethmlarson Oct 26, 2018
788cbea
Remove empty line
sethmlarson Oct 27, 2018
3e47989
Merge branch 'master' into SethMichaelLarson-patch-1
sethmlarson Nov 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/urllib3/util/ssl_.py
View file
Open in desktop
Expand Up @@ -263,6 +263,8 @@ def create_urllib3_context(ssl_version=None, cert_reqs=None,
"""
context = SSLContext(ssl_version or ssl.PROTOCOL_SSLv23)

context.set_ciphers(ciphers or DEFAULT_CIPHERS)

# Setting the default here, as we may have no ssl module on import
cert_reqs = ssl.CERT_REQUIRED if cert_reqs is None else cert_reqs

Expand Down