summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew M. Kuchling <amk@amk.ca>2010-04-30 00:52:31 +0000
committerAndrew M. Kuchling <amk@amk.ca>2010-04-30 00:52:31 +0000
commit3ded421fd56b8b6b4e4d5c70c50737a757752014 (patch)
treeb3a9538a493918687776d2257fcc9955ed100a46
parentba88b7f23b9bb135f37c913ae07bab73aab6f989 (diff)
downloadcpython-git-3ded421fd56b8b6b4e4d5c70c50737a757752014.tar.gz
Reword paragraph to make its meaning clearer.
Antoine Pitrou: is my version of the paragraph still correct? R. David Murray: is this more understandable than the previous version?
-rw-r--r--Doc/library/ssl.rst17
1 files changed, 10 insertions, 7 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 0d19fb9127..c69fac4bd2 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -121,13 +121,16 @@ Functions, Constants, and Exceptions
.. note::
- This information varies depending on the version of OpenSSL.
- For instance, in some older versions of OpenSSL (such as 0.9.7l on
- OS X 10.4), an SSLv2 client could not connect to an SSLv23 server.
- Conversely, starting from 1.0.0, an SSLv23 client will actually
- try the SSLv3 protocol unless you explicitly enable SSLv2 ciphers.
-
- The parameter ``ciphers`` sets the available ciphers for this SSL object.
+ Which connections succeed will vary depending on the version of
+ OpenSSL. For instance, in some older versions of OpenSSL (such
+ as 0.9.7l on OS X 10.4), an SSLv2 client could not connect to an
+ SSLv23 server. Another example: beginning with OpenSSL 1.0.0,
+ an SSLv23 client will not actually attempt SSLv2 connections
+ unless you explicitly enable SSLv2 ciphers; for example, you
+ might specify ``"ALL"`` or ``"SSLv2"`` as the *ciphers* parameter
+ to enable them.
+
+ The *ciphers* parameter sets the available ciphers for this SSL object.
It should be a string in the `OpenSSL cipher list format
<http://www.openssl.org/docs/apps/ciphers.html#CIPHER_LIST_FORMAT>`_.