diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-03-16 17:45:27 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-03-16 17:45:27 (GMT) |
| commit | 85586ebc39a6ac9fc1b648777566a54439b84852 (patch) | |
| tree | 9fbfae91f2fe80f84274e2f263d8f8b611c30fdd /Doc | |
| parent | 9c182a1e25409a241cf1f7e8d0141199dd4344c9 (diff) | |
| parent | 59c4eb71f23daa1a96650963eb17f2c8521cbe18 (diff) | |
| download | cpython-85586ebc39a6ac9fc1b648777566a54439b84852.zip cpython-85586ebc39a6ac9fc1b648777566a54439b84852.tar.gz cpython-85586ebc39a6ac9fc1b648777566a54439b84852.tar.bz2 | |
merge 3.4 (#23679)
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/ssl.rst | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index fe988c0..6ab11b2 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -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 ^^^^^^^^^^^^^^^^^ |