traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-35941: Fix performance regression in new code (GH-12610) 

Accumulate certificates in a set instead of doing a costly list contain
operation. A Windows cert store can easily contain over hundred
certificates. The old code would result in way over 5,000 comparison
operations

Signed-off-by: Christian Heimes <christian@python.org>
This commit is contained in:
Christian Heimes 2019-09-09 18:06:55 +02:00 committed by Steve Dower
parent 09090d04ef
commit 915cd3f069
2 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/test_ssl.py
View File

@ -835,8 +835,8 @@ class BasicSocketTests(unittest.TestCase):
cert, enc, trust = element cert, enc, trust = element
self.assertIsInstance(cert, bytes) self.assertIsInstance(cert, bytes)
self.assertIn(enc, {"x509_asn", "pkcs_7_asn"}) self.assertIn(enc, {"x509_asn", "pkcs_7_asn"})
self.assertIsInstance(trust, (set, bool)) self.assertIsInstance(trust, (frozenset, set, bool))
if isinstance(trust, set): if isinstance(trust, (frozenset, set)):
trust_oids.update(trust) trust_oids.update(trust)
serverAuth = "1.3.6.1.5.5.7.3.1" serverAuth = "1.3.6.1.5.5.7.3.1"

55
Modules/_ssl.c
View File

@ -5517,7 +5517,7 @@ parseKeyUsage(PCCERT_CONTEXT pCertCtx, DWORD flags)
} }
return PyErr_SetFromWindowsErr(error); return PyErr_SetFromWindowsErr(error);
} }
retval = PySet_New(NULL); retval = PyFrozenSet_New(NULL);
if (retval == NULL) { if (retval == NULL) {
goto error; goto error;
} }
@ -5592,19 +5592,6 @@ ssl_collect_certificates(const char *store_name)
return hCollectionStore; return hCollectionStore;
} }
/* code from Objects/listobject.c */
static int
list_contains(PyListObject *a, PyObject *el)
{
Py_ssize_t i;
int cmp;
for (i = 0, cmp = 0 ; cmp == 0 && i < Py_SIZE(a); ++i)
cmp = PyObject_RichCompareBool(PyList_GET_ITEM(a, i), el, Py_EQ);
return cmp;
}
/*[clinic input] /*[clinic input]
_ssl.enum_certificates _ssl.enum_certificates
store_name: str store_name: str
@ -5627,7 +5614,7 @@ _ssl_enum_certificates_impl(PyObject *module, const char *store_name)
PyObject *keyusage = NULL, *cert = NULL, *enc = NULL, *tup = NULL; PyObject *keyusage = NULL, *cert = NULL, *enc = NULL, *tup = NULL;
PyObject *result = NULL; PyObject *result = NULL;
result = PyList_New(0); result = PySet_New(NULL);
if (result == NULL) { if (result == NULL) {
return NULL; return NULL;
} }
@ -5667,11 +5654,10 @@ _ssl_enum_certificates_impl(PyObject *module, const char *store_name)
enc = NULL; enc = NULL;
PyTuple_SET_ITEM(tup, 2, keyusage); PyTuple_SET_ITEM(tup, 2, keyusage);
keyusage = NULL; keyusage = NULL;
if (!list_contains((PyListObject*)result, tup)) { if (PySet_Add(result, tup) == -1) {
if (PyList_Append(result, tup) < 0) { Py_CLEAR(result);
Py_CLEAR(result); Py_CLEAR(tup);
break; break;
}
} }
Py_CLEAR(tup); Py_CLEAR(tup);
} }
@ -5695,7 +5681,14 @@ _ssl_enum_certificates_impl(PyObject *module, const char *store_name)
return PyErr_SetFromWindowsErr(GetLastError()); return PyErr_SetFromWindowsErr(GetLastError());
} }
return result; /* convert set to list */
if (result == NULL) {
return NULL;
} else {
PyObject *lst = PySequence_List(result);
Py_DECREF(result);
return lst;
}
} }
/*[clinic input] /*[clinic input]
@ -5719,7 +5712,7 @@ _ssl_enum_crls_impl(PyObject *module, const char *store_name)
PyObject *crl = NULL, *enc = NULL, *tup = NULL; PyObject *crl = NULL, *enc = NULL, *tup = NULL;
PyObject *result = NULL; PyObject *result = NULL;
result = PyList_New(0); result = PySet_New(NULL);
if (result == NULL) { if (result == NULL) {
return NULL; return NULL;
} }
@ -5749,11 +5742,10 @@ _ssl_enum_crls_impl(PyObject *module, const char *store_name)
PyTuple_SET_ITEM(tup, 1, enc); PyTuple_SET_ITEM(tup, 1, enc);
enc = NULL; enc = NULL;
if (!list_contains((PyListObject*)result, tup)) { if (PySet_Add(result, tup) == -1) {
if (PyList_Append(result, tup) < 0) { Py_CLEAR(result);
Py_CLEAR(result); Py_CLEAR(tup);
break; break;
}
} }
Py_CLEAR(tup); Py_CLEAR(tup);
} }
@ -5775,7 +5767,14 @@ _ssl_enum_crls_impl(PyObject *module, const char *store_name)
Py_XDECREF(result); Py_XDECREF(result);
return PyErr_SetFromWindowsErr(GetLastError()); return PyErr_SetFromWindowsErr(GetLastError());
} }
return result; /* convert set to list */
if (result == NULL) {
return NULL;
} else {
PyObject *lst = PySequence_List(result);
Py_DECREF(result);
return lst;
}
} }
#endif /* _MSC_VER */ #endif /* _MSC_VER */