diff options
| author | Larry Hastings <larry@hastings.org> | 2015-02-26 13:58:48 (GMT) |
|---|---|---|
| committer | Larry Hastings <larry@hastings.org> | 2015-02-26 13:58:48 (GMT) |
| commit | 8c3ec536e924002dc3afe4ff92e32fe9ed82ebab (patch) | |
| tree | f141eec287584ba9d58d32461e1a7d92b5466e91 /Lib/ssl.py | |
| parent | e287746401398ee81c8e8a1513a5fe828eb32559 (diff) | |
| parent | 7b2c3c6840052ea6f8b41253faf38b9e24f9a453 (diff) | |
| download | cpython-8c3ec536e924002dc3afe4ff92e32fe9ed82ebab.zip cpython-8c3ec536e924002dc3afe4ff92e32fe9ed82ebab.tar.gz cpython-8c3ec536e924002dc3afe4ff92e32fe9ed82ebab.tar.bz2 | |
Merge 3.4.3 release engineering changes back into 3.4.
Diffstat (limited to 'Lib/ssl.py')
| -rw-r--r-- | Lib/ssl.py | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -170,14 +170,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 |