summaryrefslogtreecommitdiffstats
path: root/Lib/ssl.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-12-19 12:27:11 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2011-12-19 12:27:11 (GMT)
commit6db4944cc57804391b554d96f3400944779617f0 (patch)
treea364d79be7e165d959069b3c099416f351e33458 /Lib/ssl.py
parentbfaa79a982f1aadfe2aa4e3fdc4ff75153286503 (diff)
downloadcpython-6db4944cc57804391b554d96f3400944779617f0.zip
cpython-6db4944cc57804391b554d96f3400944779617f0.tar.gz
cpython-6db4944cc57804391b554d96f3400944779617f0.tar.bz2
Issue #13635: Add ssl.OP_CIPHER_SERVER_PREFERENCE, so that SSL servers
choose the cipher based on their own preferences, rather than on the client's.
Diffstat (limited to 'Lib/ssl.py')
-rw-r--r--Lib/ssl.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/ssl.py b/Lib/ssl.py
index 76f68f0..0cf2fae 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -66,7 +66,10 @@ from _ssl import (
SSLSyscallError, SSLEOFError,
)
from _ssl import CERT_NONE, CERT_OPTIONAL, CERT_REQUIRED
-from _ssl import OP_ALL, OP_NO_SSLv2, OP_NO_SSLv3, OP_NO_TLSv1
+from _ssl import (
+ OP_ALL, OP_NO_SSLv2, OP_NO_SSLv3, OP_NO_TLSv1,
+ OP_CIPHER_SERVER_PREFERENCE,
+ )
from _ssl import RAND_status, RAND_egd, RAND_add, RAND_bytes, RAND_pseudo_bytes
from _ssl import (
SSL_ERROR_ZERO_RETURN,