|
 |
a32293 |
diff --git a/Lib/ssl.py b/Lib/ssl.py
|
|
|
a32293 |
index 038daa4..5311321 100644
|
|
|
a32293 |
--- a/Lib/ssl.py
|
|
|
a32293 |
+++ b/Lib/ssl.py
|
|
|
a32293 |
@@ -143,38 +143,36 @@ if _ssl.HAS_TLS_UNIQUE:
|
|
|
a32293 |
else:
|
|
|
a32293 |
CHANNEL_BINDING_TYPES = []
|
|
|
a32293 |
|
|
|
a32293 |
+
|
|
|
a32293 |
# Disable weak or insecure ciphers by default
|
|
|
a32293 |
# (OpenSSL's default setting is 'DEFAULT:!aNULL:!eNULL')
|
|
|
a32293 |
# Enable a better set of ciphers by default
|
|
|
a32293 |
# This list has been explicitly chosen to:
|
|
|
a32293 |
# * Prefer cipher suites that offer perfect forward secrecy (DHE/ECDHE)
|
|
|
a32293 |
# * Prefer ECDHE over DHE for better performance
|
|
|
a32293 |
-# * Prefer any AES-GCM over any AES-CBC for better performance and security
|
|
|
a32293 |
+# * Prefer AEAD over CBC for better performance and security
|
|
|
a32293 |
# * Then Use HIGH cipher suites as a fallback
|
|
|
a32293 |
-# * Then Use 3DES as fallback which is secure but slow
|
|
|
a32293 |
# * Finally use RC4 as a fallback which is problematic but needed for
|
|
|
a32293 |
# compatibility some times.
|
|
|
a32293 |
-# * Disable NULL authentication, NULL encryption, and MD5 MACs for security
|
|
|
a32293 |
-# reasons
|
|
|
a32293 |
+# * Disable NULL authentication, NULL encryption, 3DES and MD5 MACs
|
|
|
a32293 |
+# for security reasons
|
|
|
a32293 |
_DEFAULT_CIPHERS = (
|
|
|
a32293 |
'ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+HIGH:'
|
|
|
a32293 |
- 'DH+HIGH:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+HIGH:RSA+3DES:ECDH+RC4:'
|
|
|
a32293 |
- 'DH+RC4:RSA+RC4:!aNULL:!eNULL:!MD5'
|
|
|
a32293 |
+ 'DH+HIGH:RSA+AESGCM:RSA+AES:RSA+HIGH:ECDH+RC4:DH+RC4:RSA+RC4:!aNULL:!eNULL:'
|
|
|
a32293 |
+ '!MD5:!3DES'
|
|
|
a32293 |
)
|
|
|
a32293 |
|
|
|
a32293 |
# Restricted and more secure ciphers for the server side
|
|
|
a32293 |
# This list has been explicitly chosen to:
|
|
|
a32293 |
# * Prefer cipher suites that offer perfect forward secrecy (DHE/ECDHE)
|
|
|
a32293 |
# * Prefer ECDHE over DHE for better performance
|
|
|
a32293 |
-# * Prefer any AES-GCM over any AES-CBC for better performance and security
|
|
|
a32293 |
+# * Prefer AEAD over CBC for better performance and security
|
|
|
a32293 |
# * Then Use HIGH cipher suites as a fallback
|
|
|
a32293 |
-# * Then Use 3DES as fallback which is secure but slow
|
|
|
a32293 |
-# * Disable NULL authentication, NULL encryption, MD5 MACs, DSS, and RC4 for
|
|
|
a32293 |
-# security reasons
|
|
|
a32293 |
+# * Disable NULL authentication, NULL encryption, MD5 MACs, DSS, RC4, and
|
|
|
a32293 |
+# 3DES for security reasons
|
|
|
a32293 |
_RESTRICTED_SERVER_CIPHERS = (
|
|
|
a32293 |
'ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+HIGH:'
|
|
|
a32293 |
- 'DH+HIGH:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+HIGH:RSA+3DES:!aNULL:'
|
|
|
a32293 |
- '!eNULL:!MD5:!DSS:!RC4'
|
|
|
a32293 |
+ 'DH+HIGH:RSA+AESGCM:RSA+AES:RSA+HIGH:!aNULL:!eNULL:!MD5:!DSS:!RC4:!3DES'
|
|
|
a32293 |
)
|
|
|
a32293 |
|
|
|
a32293 |
|