traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #26313: ssl.py _load_windows_store_certs fails if windows cert store is empty. Patch by Baji.

This commit is contained in:
Steve Dower 2016-03-17 15:02:39 -07:00
parent 1c80b152bd
commit 8dd7aebc23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/ssl.py
View File

@ -410,7 +410,8 @@ class SSLContext(_SSLContext):
if encoding == "x509_asn": if encoding == "x509_asn":
if trust is True or purpose.oid in trust: if trust is True or purpose.oid in trust:
certs.extend(cert) certs.extend(cert)
self.load_verify_locations(cadata=certs) if certs:
self.load_verify_locations(cadata=certs)
return certs return certs
def load_default_certs(self, purpose=Purpose.SERVER_AUTH): def load_default_certs(self, purpose=Purpose.SERVER_AUTH):

3
Misc/NEWS
View File

@ -91,6 +91,9 @@ Core and Builtins
Library Library
------- -------
- Issue #26313: ssl.py _load_windows_store_certs fails if windows cert store
is empty. Patch by Baji.
- Issue #26569: Fix :func:`pyclbr.readmodule` and :func:`pyclbr.readmodule_ex` - Issue #26569: Fix :func:`pyclbr.readmodule` and :func:`pyclbr.readmodule_ex`
to support importing packages. to support importing packages.