Skip to content

bpo-37630: Use SHA3 and SHAKE XOF from OpenSSL - #16049

Merged
miss-islington merged 3 commits into
python:masterfrom
tiran:bpo-37630-hashlib-sha3
May 16, 2020
Merged

bpo-37630: Use SHA3 and SHAKE XOF from OpenSSL#16049
miss-islington merged 3 commits into
python:masterfrom
tiran:bpo-37630-hashlib-sha3

Conversation

@tiran

@tiran tiran commented Sep 12, 2019 •
edited
Loading

Copy link
Copy Markdown
Member

OpenSSL 1.1.1 comes with SHA3 and SHAKE builtin.

Signed-off-by: Christian Heimes christian@python.org

https://bugs.python.org/issue37630

Automerge-Triggered-By: @tiran
@tiran
tiran force-pushed the bpo-37630-hashlib-sha3 branch 8 times, most recently from 844ebfb to 8303e57 Compare September 13, 2019 16:25
@tiran
tiran force-pushed the bpo-37630-hashlib-sha3 branch 2 times, most recently from d4ba8b4 to 2668569 Compare September 25, 2019 21:44
@tiran
tiran force-pushed the bpo-37630-hashlib-sha3 branch 2 times, most recently from b35c29e to 0c5e988 Compare May 15, 2020 17:58
@tiran
tiran requested a review from gpshead May 15, 2020 17:58
@tiran
tiran force-pushed the bpo-37630-hashlib-sha3 branch 2 times, most recently from 5d212e6 to 8804740 Compare May 15, 2020 18:05
@tiran
tiran requested review from encukou and vstinner May 15, 2020 18:11
@tiran

tiran commented May 15, 2020

Copy link
Copy Markdown
Member Author

@vstinner @encukou Please take a look
@tiran
tiran force-pushed the bpo-37630-hashlib-sha3 branch from 8804740 to f31da42 Compare May 15, 2020 18:21
gpshead
gpshead reviewed May 15, 2020
View reviewed changes
Comment thread Misc/NEWS.d/next/Library/2020-05-15-19-53-18.bpo-37630.O5kgAw.rst Outdated
Comment thread Modules/_hashopenssl.c Outdated
Comment thread Modules/_hashopenssl.c Outdated
Comment thread Modules/_hashopenssl.c Outdated
Comment thread Modules/_hashopenssl.c Outdated
Comment thread Modules/_hashopenssl.c Outdated
Comment thread Modules/_hashopenssl.c Outdated
@tiran

tiran commented May 15, 2020

Copy link
Copy Markdown
Member Author

@gpshead Thanks for the review, I have addressed all your comments.
tiran added 2 commits May 16, 2020 15:29
@tiran
bpo-37630: Use SHA3 and SHAKE XOF from OpenSSL
e7017b9 
OpenSSL 1.1.1 comes with SHA3 and SHAKE builtin.

Signed-off-by: Christian Heimes <christian@python.org>
@tiran
Fix size_t and decref
38a0903
@tiran
tiran force-pushed the bpo-37630-hashlib-sha3 branch from 9aec2b2 to 386a3b5 Compare May 16, 2020 13:38
@tiran

tiran commented May 16, 2020

Copy link
Copy Markdown
Member Author

@gpshead I found another issue. _hashlib.HASH() was causing a segfault. I'm now blocking the construction of objects from raw type again.
@tiran
bpo-37630: Block HASH() constructor
e90a5c4 
Also fixes a NULL ptr deref and segmentation fault.

Signed-off-by: Christian Heimes <christian@python.org>
@tiran
tiran force-pushed the bpo-37630-hashlib-sha3 branch from 386a3b5 to e90a5c4 Compare May 16, 2020 13:45
@tiran tiran mentioned this pull request May 16, 2020
Merged
@miss-islington
miss-islington merged commit d5b3f6b into python:master May 16, 2020
arturoescaip pushed a commit to arturoescaip/cpython that referenced this pull request May 24, 2020
@tiran @arturoescaip
bpo-37630: Use SHA3 and SHAKE XOF from OpenSSL (pythonGH-16049)
1fffa9e 
OpenSSL 1.1.1 comes with SHA3 and SHAKE builtin.

Signed-off-by: Christian Heimes <christian@python.org>

Automerge-Triggered-By: @tiran
@tiran tiran mentioned this pull request May 18, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

5 participants

@tiran @gpshead @the-knights-who-say-ni @bedevere-bot @miss-islington