Skip to content

bpo-34623: Use XML_SetHashSalt in _elementtree#9146

Merged
miss-islington merged 1 commit intopython:masterfrom
tiran:bpo34623-xml-setsalt
Sep 18, 2018
Merged

bpo-34623: Use XML_SetHashSalt in _elementtree#9146
miss-islington merged 1 commit intopython:masterfrom
tiran:bpo34623-xml-setsalt

Conversation

@tiran
Copy link
Member

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

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 September 10, 2018 23:07
vstinner
vstinner approved these changes Sep 11, 2018
View reviewed changes
Copy link
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

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

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
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 reviewed changes
Include/pyexpat.h Outdated
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 September 17, 2018 21:50
@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 September 18, 2018 12:40
@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>
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 vstinner approved these changes

@serhiy-storchaka serhiy-storchaka serhiy-storchaka approved these changes

Assignees

@miss-islington miss-islington

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@tiran @miss-islington @bedevere-bot @vstinner @serhiy-storchaka @the-knights-who-say-ni