mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge 3.5 (closes #25939)

Browse source
This commit is contained in:
Benjamin Peterson 2016-02-17 22:18:35 -08:00
commit 4a180a693f
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Modules/_ssl.c
View file

@ -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());