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.

Sign up for GitHub

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

gh-99108: Refactor _sha256 & _sha512 into _sha2. #101924

Merged
merged 13 commits into from
Feb 16, 2023
Merged

gh-99108: Refactor _sha256 & _sha512 into _sha2. #101924

merged 13 commits into from
Feb 16, 2023

Conversation

gpshead
Copy link
Member

@gpshead gpshead commented Feb 15, 2023 •
edited
Loading

This merges their code. They're backed by the same single HACL* static library, having them be a single module simplifies maintenance.

This should unbreak the wasm enscripten builds that currently fail due to linking in --whole-archive mode and the HACL* library appearing twice.

Long unnoticed error fixed: _sha512.SHA384Type was doubly assigned and was actually SHA512Type. Nobody depends on those internal names.

This is a followup to PRs #101707 and #101917.

@gpshead
pythongh-99108: Refactor _sha256 & _sha512 into _sha2.
fea4cdf 
This merges their code. They're backed by the same single HACL* star static
library, having them be a single module simplifies maintenance.

This should unbreak the wasm enscripten builds that currently fail due to
linking in --whole-archive mode and the HACL* library appearing twice.

Long unnoticed error fixed: `_sha512.SHA384Type` was doubly assigned and was
actually SHA512Type. Nobody depends on those internal names.
@bedevere-bot bedevere-bot mentioned this pull request Feb 15, 2023
Open
@gpshead gpshead self-assigned this Feb 15, 2023
@gpshead gpshead added extension-modules C modules in the Modules dir build The build process and cross-build labels Feb 15, 2023
@gpshead gpshead added the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Feb 15, 2023
@bedevere-bot
Copy link

🤖 New build scheduled with the buildbot fleet by @gpshead for commit 4c6a4fb 🤖

If you want to schedule another build, you need to add the :hammer: test-with-buildbots label again.

@bedevere-bot bedevere-bot removed the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Feb 15, 2023
@gpshead gpshead marked this pull request as ready for review February 15, 2023 03:04
erlend-aasland
erlend-aasland reviewed Feb 15, 2023
View reviewed changes
configure.ac Show resolved Hide resolved
Modules/sha2module.c Outdated Show resolved Hide resolved
Modules/sha2module.c Outdated Show resolved Hide resolved
Modules/sha2module.c Show resolved Hide resolved
Modules/sha2module.c Show resolved Hide resolved
Modules/sha2module.c Outdated Show resolved Hide resolved
Modules/sha2module.c Outdated Show resolved Hide resolved
Modules/sha2module.c Outdated Show resolved Hide resolved
@erlend-aasland
Copy link
Contributor

BTW, I'm pretty sure the refleaks are related to #101908.

@gpshead gpshead added the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Feb 16, 2023
@bedevere-bot
Copy link

🤖 New build scheduled with the buildbot fleet by @gpshead for commit fb6454d 🤖

If you want to schedule another build, you need to add the :hammer: test-with-buildbots label again.

@bedevere-bot bedevere-bot removed the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Feb 16, 2023
@gpshead gpshead added the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Feb 16, 2023
@bedevere-bot
Copy link

🤖 New build scheduled with the buildbot fleet by @gpshead for commit 32b8f91 🤖

If you want to schedule another build, you need to add the :hammer: test-with-buildbots label again.

@bedevere-bot bedevere-bot removed the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Feb 16, 2023
@gpshead gpshead added the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Feb 16, 2023
@bedevere-bot
Copy link

🤖 New build scheduled with the buildbot fleet by @gpshead for commit b67918d 🤖

If you want to schedule another build, you need to add the :hammer: test-with-buildbots label again.

@bedevere-bot bedevere-bot removed the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Feb 16, 2023
@gpshead gpshead merged commit 0b13575 into python:main Feb 16, 2023
@gpshead gpshead deleted the build/sha2 branch February 16, 2023 06:08
@asottile asottile mentioned this pull request Feb 16, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@erlend-aasland erlend-aasland erlend-aasland left review comments

@msprotz msprotz msprotz left review comments

@tiran tiran Awaiting requested review from tiran tiran is a code owner

@corona10 corona10 Awaiting requested review from corona10 corona10 is a code owner

Assignees

@gpshead gpshead

Labels
build The build process and cross-build extension-modules C modules in the Modules dir
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@gpshead @bedevere-bot @erlend-aasland @msprotz