Skip to content

gh-90733: improve hashlib.scrypt interface #136100

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

Merged
merged 3 commits into from
Jul 14, 2025

Conversation

picnixz
Copy link
Member

@picnixz picnixz commented Jun 29, 2025

  1. scrypt is now unconditionally available so there's no need for this additional define
  2. we actually never exposed scrypt in __all__ so I exposed it
  3. the limits for maxmem and dklen are too restrictive in its current form, but it's also fine in some sense as allowing for a larger maxmem also means removing protections and allowing for VERY large dklen isn't necessary.

@picnixz picnixz force-pushed the fix/hashlib/openssl-scrypt-90733 branch from eb1565c to 0adf063 Compare June 29, 2025 14:30
@picnixz
Copy link
Member Author

picnixz commented Jun 29, 2025

!buildbot FIPS only

@bedevere-bot
Copy link

🤖 New build scheduled with the buildbot fleet by @picnixz for commit 0adf063 🤖

Results will be shown at:

https://buildbot.python.org/all/#/grid?branch=refs%2Fpull%2F136100%2Fmerge

The command will test the builders whose names match following regular expression: FIPS only

The builders matched are:

  • AMD64 RHEL8 FIPS Only Blake2 Builtin Hash PR
  • AMD64 CentOS9 FIPS Only Blake2 Builtin Hash PR

@picnixz picnixz marked this pull request as draft July 13, 2025 11:38
@python-cla-bot
Copy link

python-cla-bot bot commented Jul 13, 2025

All commit authors signed the Contributor License Agreement.

CLA signed

@picnixz
Copy link
Member Author

picnixz commented Jul 13, 2025

HA. I merged in the wrong order!

@picnixz picnixz force-pushed the fix/hashlib/openssl-scrypt-90733 branch from 1503249 to 0adf063 Compare July 13, 2025 11:43
@picnixz picnixz marked this pull request as ready for review July 13, 2025 11:44
@picnixz
Copy link
Member Author

picnixz commented Jul 14, 2025

!buildbot FIPS only

@bedevere-bot
Copy link

🤖 New build scheduled with the buildbot fleet by @picnixz for commit 41646c4 🤖

Results will be shown at:

https://buildbot.python.org/all/#/grid?branch=refs%2Fpull%2F136100%2Fmerge

The command will test the builders whose names match following regular expression: FIPS only

The builders matched are:

  • AMD64 RHEL8 FIPS Only Blake2 Builtin Hash PR
  • AMD64 CentOS9 FIPS Only Blake2 Builtin Hash PR

@picnixz picnixz merged commit a68ddea into python:main Jul 14, 2025
43 checks passed
@picnixz picnixz deleted the fix/hashlib/openssl-scrypt-90733 branch July 14, 2025 10:49
taegyunkim pushed a commit to taegyunkim/cpython that referenced this pull request Aug 4, 2025
* add `scrypt` to `hashlib.__all__`
* improve `hashlib.scrypt` exception messages
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants