diff options
| author | R David Murray <rdmurray@bitdance.com> | 2014-03-09 04:19:45 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2014-03-09 04:19:45 (GMT) |
| commit | 04ea3f35bd0bbaa1afdf5d39c60b7087a03ddd2f (patch) | |
| tree | f4a2fc992ce3b0cd8612c984c7852e6b8f61df13 | |
| parent | e6bd31ea926a4b5adf6ef0b6472db47e0dfffbb8 (diff) | |
| download | cpython-04ea3f35bd0bbaa1afdf5d39c60b7087a03ddd2f.zip cpython-04ea3f35bd0bbaa1afdf5d39c60b7087a03ddd2f.tar.gz cpython-04ea3f35bd0bbaa1afdf5d39c60b7087a03ddd2f.tar.bz2 | |
whatsnew: SSLcontext.load_verify_locations cadata argument (#18138)
| -rw-r--r-- | Doc/whatsnew/3.4.rst | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst index 80cf2b1..7681fae 100644 --- a/Doc/whatsnew/3.4.rst +++ b/Doc/whatsnew/3.4.rst @@ -1269,6 +1269,11 @@ TLSv1.2 support) have been added; support for these protocols is only available Python is linked with OpenSSL 1.0.1 or later. (Contributed by Michele Orrù and Antoine Pitrou in :issue:`16692`) +:class:`~ssl.SSLContext` method :meth:`~ssl.SSLContext.load_verify_locations` +accepts a new optional argument *cadata*, which can be used to provide PEM or +DER encoded certificates directly via strings or bytes, respectively. +(Contributed by Christian Heimes in :issue:`18138`.) + New function :func:`~ssl.get_default_verify_paths` returns a named tuple of the paths and environment variables that the :meth:`~ssl.SSLContext.set_default_verify_paths` method uses to set |