Skip to content

C
cpython
Kaydet (Commit) 85586ebc authored tarafından Benjamin Peterson's avatar Benjamin Peterson
Dosyalara gözat
Seçenekler

merge 3.4 (#23679)

üst 9c182a1e 59c4eb71
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
Doc/library/ssl.rst
Dosyayı görüntüle @ 85586ebc
...@@ -245,8 +245,8 @@ purposes. ...@@ -245,8 +245,8 @@ purposes.
:const:`None`, this function can choose to trust the system's default :const:`None`, this function can choose to trust the system's default
CA certificates instead. CA certificates instead.
The settings in Python 3.4 are: :data:`PROTOCOL_SSLv23`, :data:`OP_NO_SSLv2`, The settings are: :data:`PROTOCOL_SSLv23`, :data:`OP_NO_SSLv2`, and
and :data:`OP_NO_SSLv3` with high encryption cipher suites without RC4 and :data:`OP_NO_SSLv3` with high encryption cipher suites without RC4 and
without unauthenticated cipher suites. Passing :data:`~Purpose.SERVER_AUTH` without unauthenticated cipher suites. Passing :data:`~Purpose.SERVER_AUTH`
as *purpose* sets :data:`~SSLContext.verify_mode` to :data:`CERT_REQUIRED` as *purpose* sets :data:`~SSLContext.verify_mode` to :data:`CERT_REQUIRED`
and either loads CA certificates (when at least one of *cafile*, *capath* or and either loads CA certificates (when at least one of *cafile*, *capath* or
...@@ -276,6 +276,10 @@ purposes. ...@@ -276,6 +276,10 @@ purposes.
.. versionadded:: 3.4 .. versionadded:: 3.4
.. versionchanged:: 3.4.4
RC4 was dropped from the default cipher string.
Random generation Random generation
^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment