summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2016-03-17 22:02:39 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2016-03-17 22:02:39 (GMT)
commit8dd7aebc23b3303bc22fcde598a2e43895046057 (patch)
tree0952b658fd746093f28f509c2b3ec60b84e6de3b
parent1c80b152bd7a793b40a729bddf19c10660b06202 (diff)
downloadcpython-8dd7aebc23b3303bc22fcde598a2e43895046057.zip
cpython-8dd7aebc23b3303bc22fcde598a2e43895046057.tar.gz
cpython-8dd7aebc23b3303bc22fcde598a2e43895046057.tar.bz2
Issue #26313: ssl.py _load_windows_store_certs fails if windows cert store is empty. Patch by Baji.
-rw-r--r--Lib/ssl.py3
-rw-r--r--Misc/NEWS3
2 files changed, 5 insertions, 1 deletions
diff --git a/Lib/ssl.py b/Lib/ssl.py
index ab7a49b..df39592 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -410,7 +410,8 @@ class SSLContext(_SSLContext):
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 --git a/Misc/NEWS b/Misc/NEWS
index 78980fe..b8509ce 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -91,6 +91,9 @@ Core and Builtins
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.