[Python-checkins] cpython (2.7): versionchanged for rc4 removal (closes #23679)

[benjamin.peterson]

https://hg.python.org/cpython/rev/e1dfa5f0709f
changeset:   95010:e1dfa5f0709f
branch:      2.7
parent:      95004:0b44c749ae51
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Mar 16 12:43:38 2015 -0500
summary:
  versionchanged for rc4 removal (closes #23679)

files:
  Doc/library/ssl.rst |  19 +++++++++++--------
  1 files changed, 11 insertions(+), 8 deletions(-)


diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -245,14 +245,13 @@
    :const:`None`, this function can choose to trust the system's default
    CA certificates instead.
 
-   The settings in Python 2.7.9 are: :data:`PROTOCOL_SSLv23`,
-   :data:`OP_NO_SSLv2`, and :data:`OP_NO_SSLv3` with high encryption cipher
-   suites without RC4 and without unauthenticated cipher suites. Passing
-   :data:`~Purpose.SERVER_AUTH` as *purpose* sets
-   :data:`~SSLContext.verify_mode` to :data:`CERT_REQUIRED` and either loads CA
-   certificates (when at least one of *cafile*, *capath* or *cadata* is given)
-   or uses :meth:`SSLContext.load_default_certs` to load default CA
-   certificates.
+   The settings are: :data:`PROTOCOL_SSLv23`, :data:`OP_NO_SSLv2`, and
+   :data:`OP_NO_SSLv3` with high encryption cipher suites without RC4 and
+   without unauthenticated cipher suites. Passing :data:`~Purpose.SERVER_AUTH`
+   as *purpose* sets :data:`~SSLContext.verify_mode` to :data:`CERT_REQUIRED`
+   and either loads CA certificates (when at least one of *cafile*, *capath* or
+   *cadata* is given) or uses :meth:`SSLContext.load_default_certs` to load
+   default CA certificates.
 
    .. note::
       The protocol, options, cipher and other settings may change to more
@@ -277,6 +276,10 @@
 
    .. versionadded:: 2.7.9
 
+   .. versionchanged:: 2.7.10
+
+     RC4 was dropped from the default cipher string.
+
 
 Random generation
 ^^^^^^^^^^^^^^^^^

-- 
Repository URL: https://hg.python.org/cpython