(original) (raw)

changeset: 100581:eb2c2671e7d6 branch: 3.5 parent: 100578:915f158633f4 user: Steve Dower steve.dower@microsoft.com date: Thu Mar 17 15:02:39 2016 -0700 files: Lib/ssl.py Misc/NEWS description: Issue #26313: ssl.py _load_windows_store_certs fails if windows cert store is empty. Patch by Baji. diff -r 915f158633f4 -r eb2c2671e7d6 Lib/ssl.py --- a/Lib/ssl.py Thu Mar 17 17:53:52 2016 -0400 +++ b/Lib/ssl.py Thu Mar 17 15:02:39 2016 -0700 @@ -410,7 +410,8 @@ if encoding == "x509_asn": if trust is True or purpose.oid in trust: certs.extend(cert) - self.load_verify_locations(cadata=certs) + if certs: + self.load_verify_locations(cadata=certs) return certs def load_default_certs(self, purpose=Purpose.SERVER_AUTH): diff -r 915f158633f4 -r eb2c2671e7d6 Misc/NEWS --- a/Misc/NEWS Thu Mar 17 17:53:52 2016 -0400 +++ b/Misc/NEWS Thu Mar 17 15:02:39 2016 -0700 @@ -91,6 +91,9 @@ 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` to support importing packages. /steve.dower@microsoft.com