X Tutup
The Wayback Machine - https://web.archive.org/web/20221223153236/https://github.com/python/cpython/pull/9146
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bpo-34623: Use XML_SetHashSalt in _elementtree #9146

Merged
merged 1 commit into from Sep 18, 2018
Merged

bpo-34623: Use XML_SetHashSalt in _elementtree #9146

merged 1 commit into from Sep 18, 2018

Conversation

tiran
Copy link
Member

@tiran tiran commented Sep 10, 2018 •
edited by bedevere-bot

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

@tiran tiran requested a review from vstinner Sep 10, 2018
vstinner
vstinner approved these changes Sep 11, 2018
View changes
Copy link
Member

@vstinner vstinner left a comment

LGTM. Just a minor question on the NEWS entry.

Misc/NEWS.d/next/Library/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst Outdated
@@ -0,0 +1,2 @@
The C accelerated _elementtree module now initializes hash randomization
salt from _Py_HashSecret instead of libexpat's default CPRNG.
Copy link
Member

@vstinner vstinner Sep 11, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CPRNG or CSPRNG? :-) Maybe even write "cryptographic pseudo-random number generator (CPRNG)".

serhiy-storchaka
serhiy-storchaka approved these changes Sep 11, 2018
View changes
Include/pyexpat.h Outdated
@@ -48,6 +52,9 @@ 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);
#if PYEXPAT_COMBINED_VERSION >= 20100
Copy link
Member

@serhiy-storchaka serhiy-storchaka Sep 11, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couldn't adding the slot conditionally break binary compatibility?

Copy link
Member Author

@tiran tiran Sep 17, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new PyExpat_CAPI_MAGIC version ensures that only compatible modules are loaded.

@tiran
bpo-34623: Use XML_SetHashSalt in _elementtree
4125d70 
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>
@tiran tiran force-pushed the bpo34623-xml-setsalt branch from cfc37f3 to 4125d70 Compare Sep 17, 2018
@tiran tiran added needs backport to 3.6 needs backport to 3.7 🤖 automerge PR will be merged once it's been approved and all CI passed labels Sep 18, 2018
@miss-islington miss-islington merged commit cb5778f into python:master Sep 18, 2018
@miss-islington
Copy link
Contributor

miss-islington commented Sep 18, 2018

Thanks @tiran for the PR 🌮🎉.. I'm working now to backport this PR to: 2.7, 3.6, 3.7.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Sep 18, 2018
@tiran @miss-islington
bpo-34623: Use XML_SetHashSalt in _elementtree (pythonGH-9146)
5f610ec 
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 cb5778f)

Co-authored-by: Christian Heimes <christian@python.org>
@bedevere-bot
Copy link

bedevere-bot commented Sep 18, 2018

GH-9392 is a backport of this pull request to the 3.7 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Sep 18, 2018
@tiran @miss-islington
bpo-34623: Use XML_SetHashSalt in _elementtree (pythonGH-9146)
0aae689 
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 cb5778f)

Co-authored-by: Christian Heimes <christian@python.org>
@bedevere-bot
Copy link

bedevere-bot commented Sep 18, 2018

GH-9393 is a backport of this pull request to the 3.6 branch.

@miss-islington
Copy link
Contributor

miss-islington commented Sep 18, 2018

Sorry, @tiran, I could not cleanly backport this to 2.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker cb5778f00ce48631c7140f33ba242496aaf7102b 2.7

@miss-islington miss-islington self-assigned this Sep 18, 2018
@tiran tiran deleted the bpo34623-xml-setsalt branch Sep 18, 2018
@bedevere-bot
Copy link

bedevere-bot commented Sep 18, 2018

GH-9394 is a backport of this pull request to the 2.7 branch.

tiran added a commit to tiran/cpython that referenced this pull request Sep 18, 2018
@tiran
[2.7] bpo-34623: Use XML_SetHashSalt in _elementtree (pythonGH-9146)
554c489 
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 cb5778f)

Co-authored-by: Christian Heimes <christian@python.org>
miss-islington added a commit that referenced this pull request Sep 18, 2018
@miss-islington @tiran
bpo-34623: Use XML_SetHashSalt in _elementtree (GH-9146)
470a435 
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 cb5778f)

Co-authored-by: Christian Heimes <christian@python.org>
miss-islington pushed a commit that referenced this pull request Sep 18, 2018
@tiran @miss-islington
[2.7] bpo-34623: Use XML_SetHashSalt in _elementtree (GH-9146) (GH-9394)
18b20ba 
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 cb5778f)

Co-authored-by: Christian Heimes <christian@python.org>



https://bugs.python.org/issue34623
miss-islington added a commit that referenced this pull request Sep 18, 2018
@miss-islington @tiran
bpo-34623: Use XML_SetHashSalt in _elementtree (GH-9146)
f7666e8 
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 cb5778f)

Co-authored-by: Christian Heimes <christian@python.org>
stratakis pushed a commit to stratakis/cpython that referenced this pull request Oct 17, 2018
@miss-islington @tiran @stratakis
bpo-34623: Use XML_SetHashSalt in _elementtree (pythonGH-9146)
73f06a7 
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 cb5778f)

Co-authored-by: Christian Heimes <christian@python.org>
stratakis pushed a commit to stratakis/cpython that referenced this pull request Oct 18, 2018
@miss-islington @tiran @stratakis
bpo-34623: Use XML_SetHashSalt in _elementtree (pythonGH-9146)
d24304f 
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 cb5778f)

Co-authored-by: Christian Heimes <christian@python.org>
yahya-abou-imran pushed a commit to yahya-abou-imran/cpython that referenced this pull request Nov 2, 2018
@tiran @yahya-abou-imran
bpo-34623: Use XML_SetHashSalt in _elementtree (pythonGH-9146)
36f776f 
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
mingwandroid pushed a commit to mingwandroid/cpython that referenced this pull request Feb 18, 2019
@tiran @mingwandroid
bpo-34623: Use XML_SetHashSalt in _elementtree (pythonGH-9146) (pytho…
d0fcb94 
…nGH-9394)

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 cb5778f)

Co-authored-by: Christian Heimes <christian@python.org>

https://bugs.python.org/issue34623
mingwandroid pushed a commit to mingwandroid/cpython that referenced this pull request Feb 23, 2019
@tiran @mingwandroid
bpo-34623: Use XML_SetHashSalt in _elementtree (pythonGH-9146) (pytho…
43cbe66 
…nGH-9394)

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 cb5778f)

Co-authored-by: Christian Heimes <christian@python.org>

https://bugs.python.org/issue34623
larryhastings pushed a commit that referenced this pull request Feb 25, 2019
@stratakis @tiran @larryhastings
[3.4] bpo-34623: Use XML_SetHashSalt in _elementtree (#9953)
d16eaf3 
* 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 cb5778f)

Co-authored-by: Christian Heimes <christian@python.org>
larryhastings pushed a commit that referenced this pull request Feb 25, 2019
@stratakis @tiran @larryhastings
[3.5] bpo-34623: Use XML_SetHashSalt in _elementtree (#9933)
41b48e7 
* 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 cb5778f)

Co-authored-by: Christian Heimes <christian@python.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vstinner vstinner

@serhiy-storchaka serhiy-storchaka

Assignees

@miss-islington miss-islington

Labels
🤖 automerge PR will be merged once it's been approved and all CI passed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@tiran @miss-islington @bedevere-bot @vstinner @serhiy-storchaka @the-knights-who-say-ni
X Tutup