cpython: 7d914d4b05fe (original) (raw)
Mercurial > cpython
changeset 87344:7d914d4b05fe
Issue #19448: report name / NID in exception message of ASN1Object [#19448]
| Christian Heimes christian@cheimes.de | |
|---|---|
| date | Fri, 22 Nov 2013 16:20:53 +0100 |
| parents | de65df13ed50 |
| children | 364b29d1c79d |
| files | Lib/test/test_ssl.py Modules/_ssl.c |
| diffstat | 2 files changed, 7 insertions(+), 5 deletions(-)[+] [-] Lib/test/test_ssl.py 6 Modules/_ssl.c 6 |
line wrap: on
line diff
--- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -585,7 +585,8 @@ class BasicSocketTests(unittest.TestCase self.assertEqual(val, expected) self.assertIsInstance(val, ssl._ASN1Object) self.assertRaises(ValueError, ssl._ASN1Object.fromnid, -1)
self.assertRaises(ValueError, ssl._ASN1Object.fromnid, 100000)[](#l1.7)
with self.assertRaisesRegex(ValueError, "unknown NID 100000"):[](#l1.8)ssl._ASN1Object.fromnid(100000)[](#l1.9) for i in range(1000):[](#l1.10) try:[](#l1.11) obj = ssl._ASN1Object.fromnid(i)[](#l1.12)
@@ -603,7 +604,8 @@ class BasicSocketTests(unittest.TestCase self.assertEqual(ssl._ASN1Object.fromname('serverAuth'), expected) self.assertEqual(ssl._ASN1Object.fromname('1.3.6.1.5.5.7.3.1'), expected)
self.assertRaises(ValueError, ssl._ASN1Object.fromname, 'serverauth')[](#l1.17)
with self.assertRaisesRegex(ValueError, "unknown object 'serverauth'"):[](#l1.18)ssl._ASN1Object.fromname('serverauth')[](#l1.19)
class ContextTests(unittest.TestCase):
--- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -3387,7 +3387,7 @@ PySSL_txt2obj(PyObject *self, PyObject * } obj = OBJ_txt2obj(txt, name ? 0 : 1); if (obj == NULL) {
PyErr_Format(PyExc_ValueError, "Unknown object");[](#l2.7)
} result = asn1obj2py(obj); @@ -3411,12 +3411,12 @@ PySSL_nid2obj(PyObject *self, PyObject * return NULL; } if (nid < NID_undef) {PyErr_Format(PyExc_ValueError, "unknown object '%.100s'", txt);[](#l2.8) return NULL;[](#l2.9)
PyErr_Format(PyExc_ValueError, "NID must be positive.");[](#l2.16)
} obj = OBJ_nid2obj(nid); if (obj == NULL) {PyErr_SetString(PyExc_ValueError, "NID must be positive.");[](#l2.17) return NULL;[](#l2.18)
PyErr_Format(PyExc_ValueError, "Unknown NID");[](#l2.22)