diff options
| author | stratakis <cstratak@redhat.com> | 2019-02-25 21:04:09 (GMT) |
|---|---|---|
| committer | larryhastings <larry@hastings.org> | 2019-02-25 21:04:09 (GMT) |
| commit | 41b48e71ac8a71f56694b548f118bd20ce203410 (patch) | |
| tree | ee0a51c3ec598d7becda5d73c7bb068d9fec2dfa | |
| parent | 1a2b52bbd2c6513aaf5bb915890ea7647713d5df (diff) | |
| download | cpython-41b48e71ac8a71f56694b548f118bd20ce203410.zip cpython-41b48e71ac8a71f56694b548f118bd20ce203410.tar.gz cpython-41b48e71ac8a71f56694b548f118bd20ce203410.tar.bz2 | |
[3.5] bpo-34623: Use XML_SetHashSalt in _elementtree (#9933)
* bpo-34623: Use XML_SetHashSalt in _elementtree (GH-9146)
The C accelerated _elementtree module now initializes hash randomization
salt from _Py_HashSecret instead of libexpat's default CPRNG.
Signed-off-by: Christian Heimes <christian@python.org>
https://bugs.python.org/issue34623
(cherry picked from commit cb5778f00ce48631c7140f33ba242496aaf7102b)
Co-authored-by: Christian Heimes <christian@python.org>
| -rw-r--r-- | Include/pyexpat.h | 4 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst | 2 | ||||
| -rw-r--r-- | Modules/_elementtree.c | 5 | ||||
| -rw-r--r-- | Modules/pyexpat.c | 5 |
4 files changed, 15 insertions, 1 deletions
diff --git a/Include/pyexpat.h b/Include/pyexpat.h index 44259bf..07020b5 100644 --- a/Include/pyexpat.h +++ b/Include/pyexpat.h @@ -3,7 +3,7 @@ /* note: you must import expat.h before importing this module! */ -#define PyExpat_CAPI_MAGIC "pyexpat.expat_CAPI 1.0" +#define PyExpat_CAPI_MAGIC "pyexpat.expat_CAPI 1.1" #define PyExpat_CAPSULE_NAME "pyexpat.expat_CAPI" struct PyExpat_CAPI @@ -48,6 +48,8 @@ struct PyExpat_CAPI enum XML_Status (*SetEncoding)(XML_Parser parser, const XML_Char *encoding); int (*DefaultUnknownEncodingHandler)( void *encodingHandlerData, const XML_Char *name, XML_Encoding *info); + /* might be none for expat < 2.1.0 */ + int (*SetHashSalt)(XML_Parser parser, unsigned long hash_salt); /* always add new stuff to the end! */ }; diff --git a/Misc/NEWS.d/next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst b/Misc/NEWS.d/next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst new file mode 100644 index 0000000..cbaa4b7 --- /dev/null +++ b/Misc/NEWS.d/next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst @@ -0,0 +1,2 @@ +CVE-2018-14647: The C accelerated _elementtree module now initializes hash +randomization salt from _Py_HashSecret instead of libexpat's default CSPRNG. diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c index 5dba9f7..90c6daf 100644 --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -3282,6 +3282,11 @@ _elementtree_XMLParser___init___impl(XMLParserObject *self, PyObject *html, PyErr_NoMemory(); return -1; } + /* expat < 2.1.0 has no XML_SetHashSalt() */ + if (EXPAT(SetHashSalt) != NULL) { + EXPAT(SetHashSalt)(self->parser, + (unsigned long)_Py_HashSecret.expat.hashsalt); + } if (target) { Py_INCREF(target); diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c index adc9b6c..948ab1b 100644 --- a/Modules/pyexpat.c +++ b/Modules/pyexpat.c @@ -1882,6 +1882,11 @@ MODULE_INITFUNC(void) capi.SetStartDoctypeDeclHandler = XML_SetStartDoctypeDeclHandler; capi.SetEncoding = XML_SetEncoding; capi.DefaultUnknownEncodingHandler = PyUnknownEncodingHandler; +#if XML_COMBINED_VERSION >= 20100 + capi.SetHashSalt = XML_SetHashSalt; +#else + capi.SetHashSalt = NULL; +#endif /* export using capsule */ capi_object = PyCapsule_New(&capi, PyExpat_CAPSULE_NAME, NULL); |