summaryrefslogtreecommitdiffstats
path: root/Modules/expat/pyexpatns.h
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2012-03-14 21:26:55 (GMT)
committerGregory P. Smith <greg@krypto.org>2012-03-14 21:26:55 (GMT)
commit8e91cf6a5e5be8f84132498d5654d6ad2e4d54c2 (patch)
tree3c473971bf386649c6a8179c48a59146cd85c63e /Modules/expat/pyexpatns.h
parent273cd1812a7c8646b52aa3afee1c5db5a0e539d6 (diff)
downloadcpython-8e91cf6a5e5be8f84132498d5654d6ad2e4d54c2.zip
cpython-8e91cf6a5e5be8f84132498d5654d6ad2e4d54c2.tar.gz
cpython-8e91cf6a5e5be8f84132498d5654d6ad2e4d54c2.tar.bz2
Fixes issue #14234: CVE-2012-0876: Randomize hashes of xml attributes
in the hash table internal to the pyexpat module's copy of the expat library to avoid a denial of service due to hash collisions. Patch by David Malcolm with some modifications by the expat project.
Diffstat (limited to 'Modules/expat/pyexpatns.h')
-rw-r--r--Modules/expat/pyexpatns.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/expat/pyexpatns.h b/Modules/expat/pyexpatns.h
index 7fbd341..2f2f4f9 100644
--- a/Modules/expat/pyexpatns.h
+++ b/Modules/expat/pyexpatns.h
@@ -97,6 +97,7 @@
#define XML_SetEntityDeclHandler PyExpat_XML_SetEntityDeclHandler
#define XML_SetExternalEntityRefHandler PyExpat_XML_SetExternalEntityRefHandler
#define XML_SetExternalEntityRefHandlerArg PyExpat_XML_SetExternalEntityRefHandlerArg
+#define XML_SetHashSalt PyExpat_XML_SetHashSalt
#define XML_SetNamespaceDeclHandler PyExpat_XML_SetNamespaceDeclHandler
#define XML_SetNotationDeclHandler PyExpat_XML_SetNotationDeclHandler
#define XML_SetNotStandaloneHandler PyExpat_XML_SetNotStandaloneHandler