Fix pk12util and add PBKDF2 #139
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
FIPS doesn't have scrypt. This implements PBKDF2 instead. Enabled by default at 600,000 rounds for FIPS. 600,000 being the current OWASP recommendation for SHA256 HMAC.
LinuxJedi
force-pushed
the
fix-tests
branch
3 times, most recently
from
aea1ad9 to
d89b762
Compare
Merged
dgarske
requested changes
Aug 22, 2025
dgarske
requested changes
Aug 22, 2025
Also fix line lengths
dgarske
requested changes
Aug 22, 2025
dgarske
approved these changes
Aug 22, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR:
CKM_NSS_PKCS12_PBE_SHA*_HMAC_KEY_GENCKM_PKCS5_PBKD2CKA_NSS_DBas an ignored attribute (to suppress errors)The first three are required to make NSS
pk12utilwork. The last one is enabled by default for FIPS, but the options--enable-pbkdf2and--pbkdf2-iterationshave been added to use it in other builds.PBKDF2 for pin is set to 600,000 rounds by default, which is the OWASP recommendation.