extern/httpie-cli
1
0
Fork 1
mirror of https://github.com/httpie/cli.git synced 2024-11-28 10:43:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean up DEFAULT_SSL_CIPHERS comments

Browse Source
This commit is contained in:
Jakub Roztocil 2023-05-19 21:50:58 +02:00
parent 4e29a6d561
commit d021b94b5d
1 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
httpie/ssl_.py
View File

@ -8,10 +8,12 @@ from urllib3.util.ssl_ import (
resolve_ssl_version, resolve_ssl_version,
) )
# We used to import default SSL ciphers via `SSL_CIPHERS` from `urllib3` but it’s been removed,
# Default ciphers imported from urllib3 as a work around for https://github.com/httpie/httpie/issues/1499 # so we’ve copied the original list here.
# Removed from urllib3 in this commit: https://github.com/urllib3/urllib3/commit/e5eac0c # Our issue: <https://github.com/httpie/httpie/issues/1499>
#################### # Removal commit: <https://github.com/urllib3/urllib3/commit/e5eac0c>
DEFAULT_SSL_CIPHERS = ":".join([
# <urllib3>
# A secure default. # A secure default.
# Sources for more information on TLS ciphers: # Sources for more information on TLS ciphers:
# #
@ -29,8 +31,6 @@ from urllib3.util.ssl_ import (
# insecure ciphers for security reasons. # insecure ciphers for security reasons.
# - NOTE: TLS 1.3 cipher suites are managed through a different interface # - NOTE: TLS 1.3 cipher suites are managed through a different interface
# not exposed by CPython (yet!) and are enabled by default if they're available. # not exposed by CPython (yet!) and are enabled by default if they're available.
DEFAULT_SSL_CIPHERS = ":".join(
[
"ECDHE+AESGCM", "ECDHE+AESGCM",
"ECDHE+CHACHA20", "ECDHE+CHACHA20",
"DHE+AESGCM", "DHE+AESGCM",
@ -46,8 +46,8 @@ DEFAULT_SSL_CIPHERS = ":".join(
"!MD5", "!MD5",
"!DSS", "!DSS",
"!AESCCM", "!AESCCM",
] # </urllib3>
) ])
SSL_VERSION_ARG_MAPPING = { SSL_VERSION_ARG_MAPPING = {
'ssl2.3': 'PROTOCOL_SSLv23', 'ssl2.3': 'PROTOCOL_SSLv23',
'ssl3': 'PROTOCOL_SSLv3', 'ssl3': 'PROTOCOL_SSLv3',