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?
This commit is contained in:
Andrew M. Kuchling 2010-04-30 00:52:31 +00:00
parent ba88b7f23b
commit 3ded421fd5

View file

@ -121,13 +121,16 @@ Functions, Constants, and Exceptions
.. note:: .. note::
This information varies depending on the version of OpenSSL. Which connections succeed will vary depending on the version of
For instance, in some older versions of OpenSSL (such as 0.9.7l on OpenSSL. For instance, in some older versions of OpenSSL (such
OS X 10.4), an SSLv2 client could not connect to an SSLv23 server. as 0.9.7l on OS X 10.4), an SSLv2 client could not connect to an
Conversely, starting from 1.0.0, an SSLv23 client will actually SSLv23 server. Another example: beginning with OpenSSL 1.0.0,
try the SSLv3 protocol unless you explicitly enable SSLv2 ciphers. 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 parameter ``ciphers`` sets the available ciphers for this SSL object. The *ciphers* parameter sets the available ciphers for this SSL object.
It should be a string in the `OpenSSL cipher list format It should be a string in the `OpenSSL cipher list format
<http://www.openssl.org/docs/apps/ciphers.html#CIPHER_LIST_FORMAT>`_. <http://www.openssl.org/docs/apps/ciphers.html#CIPHER_LIST_FORMAT>`_.