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
4a180a69
Commit
4a180a69
authored
Feb 17, 2016
by
Benjamin Peterson
Browse files
Options
Browse Files
Download
Plain Diff
merge 3.5 (closes #25939)
parents
5ab2699c
1378f7ca
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
Misc/NEWS
Misc/NEWS
+2
-0
Modules/_ssl.c
Modules/_ssl.c
+6
-2
No files found.
Misc/NEWS
View file @
4a180a69
...
...
@@ -186,6 +186,8 @@ Core and Builtins
Library
-------
-
Issue
#
25939
:
On
Windows
open
the
cert
store
readonly
in
ssl
.
enum_certificates
.
-
Issue
#
25995
:
os
.
walk
()
no
longer
uses
FDs
proportional
to
the
tree
depth
.
-
Issue
#
25994
:
Added
the
close
()
method
and
the
support
of
the
context
manager
...
...
Modules/_ssl.c
View file @
4a180a69
...
...
@@ -4198,7 +4198,9 @@ _ssl_enum_certificates_impl(PyModuleDef *module, const char *store_name)
if
(
result
==
NULL
)
{
return
NULL
;
}
hStore
=
CertOpenSystemStore
((
HCRYPTPROV
)
NULL
,
store_name
);
hStore
=
CertOpenStore
(
CERT_STORE_PROV_SYSTEM_A
,
0
,
(
HCRYPTPROV
)
NULL
,
CERT_STORE_READONLY_FLAG
|
CERT_SYSTEM_STORE_LOCAL_MACHINE
,
store_name
);
if
(
hStore
==
NULL
)
{
Py_DECREF
(
result
);
return
PyErr_SetFromWindowsErr
(
GetLastError
());
...
...
@@ -4284,7 +4286,9 @@ _ssl_enum_crls_impl(PyModuleDef *module, const char *store_name)
if
(
result
==
NULL
)
{
return
NULL
;
}
hStore
=
CertOpenSystemStore
((
HCRYPTPROV
)
NULL
,
store_name
);
hStore
=
CertOpenStore
(
CERT_STORE_PROV_SYSTEM_A
,
0
,
(
HCRYPTPROV
)
NULL
,
CERT_STORE_READONLY_FLAG
|
CERT_SYSTEM_STORE_LOCAL_MACHINE
,
store_name
);
if
(
hStore
==
NULL
)
{
Py_DECREF
(
result
);
return
PyErr_SetFromWindowsErr
(
GetLastError
());
...
...
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