diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-02-18 06:18:35 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-02-18 06:18:35 (GMT) |
| commit | 4a180a693f5e926784f65855734c4726839dcf48 (patch) | |
| tree | 5f27b7811d1335961361f85103b57f8ebf0e72ea | |
| parent | 5ab2699c282a83523d753c8bd7278c8f2aa93608 (diff) | |
| parent | 1378f7ca68329e6eebdd1b47bcb7b86fca2aff24 (diff) | |
| download | cpython-4a180a693f5e926784f65855734c4726839dcf48.zip cpython-4a180a693f5e926784f65855734c4726839dcf48.tar.gz cpython-4a180a693f5e926784f65855734c4726839dcf48.tar.bz2 | |
merge 3.5 (closes #25939)
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/_ssl.c | 8 |
2 files changed, 8 insertions, 2 deletions
@@ -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 diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 529d2f0..c96237e 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -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()); |