diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-02-19 22:58:19 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-02-19 22:58:19 (GMT) |
| commit | 869311dd97bff0b22689fcfe1b348bad6b1ab4e6 (patch) | |
| tree | 354def6c6564f7a7c5d94e1ae3588028da05de83 /Lib/ssl.py | |
| parent | 3892189db0066f4d2c89f2857a630a5ffac38701 (diff) | |
| parent | 500af332f407d9a83a0232e4018e10cb49a76a79 (diff) | |
| download | cpython-869311dd97bff0b22689fcfe1b348bad6b1ab4e6.zip cpython-869311dd97bff0b22689fcfe1b348bad6b1ab4e6.tar.gz cpython-869311dd97bff0b22689fcfe1b348bad6b1ab4e6.tar.bz2 | |
merge 3.4 (#23481)
Diffstat (limited to 'Lib/ssl.py')
| -rw-r--r-- | Lib/ssl.py | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -164,14 +164,12 @@ else: # * Prefer any AES-GCM over any AES-CBC for better performance and security # * Then Use HIGH cipher suites as a fallback # * Then Use 3DES as fallback which is secure but slow -# * Finally use RC4 as a fallback which is problematic but needed for -# compatibility some times. # * Disable NULL authentication, NULL encryption, and MD5 MACs for security # reasons _DEFAULT_CIPHERS = ( 'ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+HIGH:' - 'DH+HIGH:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+HIGH:RSA+3DES:ECDH+RC4:' - 'DH+RC4:RSA+RC4:!aNULL:!eNULL:!MD5' + 'DH+HIGH:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+HIGH:RSA+3DES:!aNULL:' + '!eNULL:!MD5' ) # Restricted and more secure ciphers for the server side |