Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge 3.4 (#23679)

This commit is contained in:
Benjamin Peterson 2015-03-16 12:45:27 -05:00
parent 9c182a1e25 59c4eb71f2
commit 85586ebc39
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Doc/library/ssl.rst
View File

@ -245,8 +245,8 @@ purposes.
: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 @@ purposes.
.. versionadded:: 3.4
.. versionchanged:: 3.4.4
RC4 was dropped from the default cipher string.
Random generation
^^^^^^^^^^^^^^^^^