[Python-checkins] cpython (2.7): Issue #26313: ssl.py _load_windows_store_certs fails if windows cert store is

[steve.dower]

https://hg.python.org/cpython/rev/8df52636b0dc
changeset:   100580:8df52636b0dc
branch:      2.7
parent:      100577:fa68df1d5e65
user:        Steve Dower <steve.dower at microsoft.com>
date:        Thu Mar 17 15:02:19 2016 -0700
summary:
  Issue #26313: ssl.py _load_windows_store_certs fails if windows cert store is empty. Patch by Baji.

files:
  Lib/ssl.py |  3 ++-
  Misc/NEWS  |  3 +++
  2 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/Lib/ssl.py b/Lib/ssl.py
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -380,7 +380,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 --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -58,6 +58,9 @@
 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

-- 
Repository URL: https://hg.python.org/cpython