diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-03-05 03:50:25 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-03-05 03:50:25 (GMT) |
| commit | de8eca46385842a2d5c75ee5a9a8c596735f9c68 (patch) | |
| tree | b22236bed104ef1b6c4d4e4604d533fb3bb64bb6 /Doc/library/ssl.rst | |
| parent | b64ae7bf2dcc010e6f0414d365e1ee4caba58ef0 (diff) | |
| parent | 990fcaac3c428569697f62a80fd95ab4d4b93151 (diff) | |
| download | cpython-de8eca46385842a2d5c75ee5a9a8c596735f9c68.zip cpython-de8eca46385842a2d5c75ee5a9a8c596735f9c68.tar.gz cpython-de8eca46385842a2d5c75ee5a9a8c596735f9c68.tar.bz2 | |
merge 3.4
Diffstat (limited to 'Doc/library/ssl.rst')
| -rw-r--r-- | Doc/library/ssl.rst | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index 254fc1f..7846cad 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -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. |