diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2018-09-18 06:11:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-18 06:11:09 -0700 |
| commit | 470a435f3b42c9be5fdb7f7b04f3df5663ba7305 (patch) | |
| tree | 4b9b2acd8f5230ff4f5bdc2ddc0f28e64fe9b0e5 /Include | |
| parent | 45452b738b7f94221a94e903fb5975222fbb7a8f (diff) | |
| download | cpython-git-470a435f3b42c9be5fdb7f7b04f3df5663ba7305.tar.gz | |
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>
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/pyexpat.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Include/pyexpat.h b/Include/pyexpat.h index 44259bf6d7..07020b5dc9 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! */ }; |