From: Steve Dower <steve.dower@microsoft.com>
Date: Thu, 17 Mar 2016 22:02:19 +0000 (-0700)
Subject: Issue #26313: ssl.py _load_windows_store_certs fails if windows cert store is empty... 
X-Git-Tag: v2.7.12rc1~171
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9cb2074fe44cfd6dd79a5f741619c376ed03da14;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/ssl.py b/Lib/ssl.py
index 5df6ed3f1645..34f7aaa6ac39 100644
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -380,7 +380,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 29d4a4c0f9be..18df31755b81 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -58,6 +58,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #26313: ssl.py _load_windows_store_certs fails if windows cert store
+  is empty. Patch by Baji.
+
 - Issue #26513: Fixes platform module detection of Windows Server
 
 - Issue #23718: Fixed parsing time in week 0 before Jan 1.  Original patch by