cpython: 8ff4c1827499 (original) (raw)

Mercurial > cpython

changeset 100252:8ff4c1827499 3.5

merge 3.4 (closes #25939) [#25939]

Benjamin Peterson benjamin@python.org
date	Wed, 17 Feb 2016 22🔞20 -0800
parents	8ee91cb2e2a4(current diff)9f29cf9ad17f(diff)
children	d6474257ef38 69717fdd9d5a
files	Misc/NEWS Modules/_ssl.c Modules/clinic/_ssl.c.h
diffstat	2 files changed, 8 insertions(+), 2 deletions(-)[+] [-] Misc/NEWS 2 Modules/_ssl.c 8

line wrap: on

line diff

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -76,6 +76,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 #26117: The os.scandir() iterator now closes file descriptor not only

--- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -4198,7 +4198,9 @@ static PyObject * 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,[](#l2.9)

```
                       store_name);[](#l2.10)
```
if (hStore == NULL) { Py_DECREF(result); return PyErr_SetFromWindowsErr(GetLastError());

@@ -4284,7 +4286,9 @@ static PyObject * 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,[](#l2.20)

```
                       store_name);[](#l2.21)
```
if (hStore == NULL) { Py_DECREF(result); return PyErr_SetFromWindowsErr(GetLastError());