Skip to content

/ cpython

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.

This comment has been minimized.

Sign in to view
@vstinner

vstinner Sep 11, 2018
Member

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

This comment has been minimized.

Sign in to view
@serhiy-storchaka

serhiy-storchaka Sep 11, 2018
Member

Couldn't adding the slot conditionally break binary compatibility?

This comment has been minimized.

Sign in to view
@tiran

tiran Sep 17, 2018
Author Member

The new PyExpat_CAPI_MAGIC version ensures that only compatible modules are loaded.
@tiran
bpo-34623: Use XML_SetHashSalt in _elementtree
Loading status checks…
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 tiran:bpo34623-xml-setsalt branch from cfc37f3 to 4125d70 Sep 17, 2018
@miss-islington miss-islington merged commit cb5778f into python:master Sep 18, 2018
9 checks passed
9 checks passed
Linux-PR #Linux-PR_20180917.56 succeeded
Details
Linux-PR-Coverage #Linux-PR-Coverage_20180917.43 succeeded
Details
Windows-PR #Windows-PR_20180917.56 succeeded
Details
bedevere/issue-number Issue number 34623 found
Details
bedevere/news News entry found in Misc/NEWS.d
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
docs #docs_20180917.56 succeeded
Details
macOS-PR #macOS-PR_20180917.56 succeeded
Details
@miss-islington
Copy link
Contributor

@miss-islington 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 added 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 bedevere-bot commented Sep 18, 2018

GH-9392 is a backport of this pull request to the 3.7 branch.
miss-islington added 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 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 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 tiran:bpo34623-xml-setsalt branch Sep 18, 2018
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)
72ce8c8 
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 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)
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
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 added 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)
Loading status checks…
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)
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
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 added 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 added 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 added 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 added 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 added 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 added a commit that referenced this pull request Feb 25, 2019
@stratakis @tiran @larryhastings
[3.4] bpo-34623: Use XML_SetHashSalt in _elementtree (#9953)
Loading status checks…
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 added a commit that referenced this pull request Feb 25, 2019
@stratakis @tiran @larryhastings
[3.5] bpo-34623: Use XML_SetHashSalt in _elementtree (#9933)
Loading status checks…
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 CLA signed
Projects
None yet
Milestone
No milestone
Linked issues

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