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

[benjamin.peterson]

https://hg.python.org/cpython/rev/2a6a63828a40
changeset:   95011:2a6a63828a40
branch:      3.4
parent:      95005:d44a908b7ca0
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 |  8 ++++++--
  1 files changed, 6 insertions(+), 2 deletions(-)


diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -245,8 +245,8 @@
    :const:`None`, this function can choose to trust the system's default
    CA certificates instead.
 
-   The settings in Python 3.4 are: :data:`PROTOCOL_SSLv23`, :data:`OP_NO_SSLv2`,
-   and :data:`OP_NO_SSLv3` with high encryption cipher suites without RC4 and
+   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
@@ -276,6 +276,10 @@
 
    .. versionadded:: 3.4
 
+   .. versionchanged:: 3.4.4
+
+     RC4 was dropped from the default cipher string.
+
 
 Random generation
 ^^^^^^^^^^^^^^^^^

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