summaryrefslogtreecommitdiffstats
path: root/Doc/library/ssl.rst
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 /Doc/library/ssl.rst
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 'Doc/library/ssl.rst')
-rw-r--r--Doc/library/ssl.rst7
1 files changed, 7 insertions, 0 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 6651a69..69eaf8b 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -421,6 +421,13 @@ Constants
.. versionadded:: 3.2
+.. data:: OP_CIPHER_SERVER_PREFERENCE
+
+ Use the server's cipher ordering preference, rather than the client's.
+ This option has no effect on client sockets and SSLv2 server sockets.
+
+ .. versionadded:: 3.3
+
.. data:: HAS_SNI
Whether the OpenSSL library has built-in support for the *Server Name