(original) (raw)

changeset: 89529:8e3b3b4a90fb user: R David Murray rdmurray@bitdance.com date: Sat Mar 08 23:19:45 2014 -0500 files: Doc/whatsnew/3.4.rst description: whatsnew: SSLcontext.load_verify_locations cadata argument (#18138) diff -r dde3fb877b07 -r 8e3b3b4a90fb Doc/whatsnew/3.4.rst --- a/Doc/whatsnew/3.4.rst Sat Mar 08 23🔞09 2014 -0500 +++ b/Doc/whatsnew/3.4.rst Sat Mar 08 23:19:45 2014 -0500 @@ -1269,6 +1269,11 @@ 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 /rdmurray@bitdance.com