mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge 3.4

Browse source
This commit is contained in:
Benjamin Peterson 2015-03-04 22:50:25 -05:00
commit de8eca4638
3 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Doc/library/ssl.rst
View file

@ -520,9 +520,9 @@ Constants
.. data:: VERIFY_DEFAULT
Possible value for :attr:`SSLContext.verify_flags`. In this mode,
certificate revocation lists (CRLs) are not checked. By default OpenSSL
does neither require nor verify CRLs.
Possible value for :attr:`SSLContext.verify_flags`. In this mode, certificate
revocation lists (CRLs) are not checked. By default OpenSSL does neither
require nor verify CRLs.
.. versionadded:: 3.4
@ -550,6 +550,14 @@ Constants
.. versionadded:: 3.4
.. data:: VERIFY_X509_TRUSTED_FIRST
Possible value for :attr:`SSLContext.verify_flags`. It instructs OpenSSL to
prefer trusted certificates when building the trust chain to validate a
certificate. This flag is enabled by default.
.. versionadded:: 3.4.5
.. data:: PROTOCOL_SSLv23
Selects the highest protocol version that both the client and server support.