diff options
-rw-r--r-- | Lib/test/test_ssl.py | 4 | ||||
-rw-r--r-- | Modules/_ssl.c | 56 |
2 files changed, 29 insertions, 31 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 879d944f32..48c4fecabd 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -832,8 +832,8 @@ class BasicSocketTests(unittest.TestCase): cert, enc, trust = element self.assertIsInstance(cert, bytes) self.assertIn(enc, {"x509_asn", "pkcs_7_asn"}) - self.assertIsInstance(trust, (set, bool)) - if isinstance(trust, set): + self.assertIsInstance(trust, (frozenset, set, bool)) + if isinstance(trust, (frozenset, set)): trust_oids.update(trust) serverAuth = "1.3.6.1.5.5.7.3.1" diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 6f91b48825..64060c64c4 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -5517,7 +5517,7 @@ parseKeyUsage(PCCERT_CONTEXT pCertCtx, DWORD flags) } return PyErr_SetFromWindowsErr(error); } - retval = PySet_New(NULL); + retval = PyFrozenSet_New(NULL); if (retval == NULL) { goto error; } @@ -5592,20 +5592,6 @@ ssl_collect_certificates(const char *store_name) 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(el, PyList_GET_ITEM(a, i), - Py_EQ); - return cmp; -} - /*[clinic input] _ssl.enum_certificates store_name: str @@ -5628,7 +5614,7 @@ _ssl_enum_certificates_impl(PyObject *module, const char *store_name) PyObject *keyusage = NULL, *cert = NULL, *enc = NULL, *tup = NULL; PyObject *result = NULL; - result = PyList_New(0); + result = PySet_New(NULL); if (result == NULL) { return NULL; } @@ -5668,11 +5654,10 @@ _ssl_enum_certificates_impl(PyObject *module, const char *store_name) enc = NULL; PyTuple_SET_ITEM(tup, 2, keyusage); keyusage = NULL; - if (!list_contains((PyListObject*)result, tup)) { - if (PyList_Append(result, tup) < 0) { - Py_CLEAR(result); - break; - } + if (PySet_Add(result, tup) == -1) { + Py_CLEAR(result); + Py_CLEAR(tup); + break; } Py_CLEAR(tup); } @@ -5696,7 +5681,14 @@ _ssl_enum_certificates_impl(PyObject *module, const char *store_name) 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] @@ -5720,7 +5712,7 @@ _ssl_enum_crls_impl(PyObject *module, const char *store_name) PyObject *crl = NULL, *enc = NULL, *tup = NULL; PyObject *result = NULL; - result = PyList_New(0); + result = PySet_New(NULL); if (result == NULL) { return NULL; } @@ -5750,11 +5742,10 @@ _ssl_enum_crls_impl(PyObject *module, const char *store_name) PyTuple_SET_ITEM(tup, 1, enc); enc = NULL; - if (!list_contains((PyListObject*)result, tup)) { - if (PyList_Append(result, tup) < 0) { - Py_CLEAR(result); - break; - } + if (PySet_Add(result, tup) == -1) { + Py_CLEAR(result); + Py_CLEAR(tup); + break; } Py_CLEAR(tup); } @@ -5776,7 +5767,14 @@ _ssl_enum_crls_impl(PyObject *module, const char *store_name) Py_XDECREF(result); 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 */ |