Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
8dd7aebc
Commit
8dd7aebc
authored
Mar 17, 2016
by
Steve Dower
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #26313: ssl.py _load_windows_store_certs fails if windows cert store is empty. Patch by Baji.
parent
1c80b152
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
Lib/ssl.py
Lib/ssl.py
+2
-1
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/ssl.py
View file @
8dd7aebc
...
@@ -410,7 +410,8 @@ class SSLContext(_SSLContext):
...
@@ -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):
...
...
Misc/NEWS
View file @
8dd7aebc
...
@@ -91,6 +91,9 @@ Core and Builtins
...
@@ -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.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment