Sync bcrypt_pbkdf.c (v1.13→v1.17) and blowfish.c (v1.19→v1.20) from OpenBSD#36
Merged
Conversation
…penBSD Key changes in bcrypt_pbkdf.c: - switch SHA512 to crypto_hash_sha512() (simpler one-call API) - heap-allocate countsalt to safely handle any salt length - add saltlen > 1<<20 DoS guard - fix blf_enc call: sizeof(cdata)/sizeof(uint64_t) -> BCRYPT_WORDS/2 - zero tmpout in cleanup (was missing) blowfish.c: drop superseded advertising clause from license
mfazekas
force-pushed
the
sync-openbsd-sources
branch
from
e28b35c to
ea84e39
Compare
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Updates the two copied OpenBSD C sources to their current versions in openssh-portable.
bcrypt_pbkdf.c v1.13 (2015) → v1.17 (2022):
SHA512Init/Update/Finalwithcrypto_hash_sha512()— already available in this gem viacrypto_api.hcountsaltviacalloc(1, saltlen + 4)instead of a fixed 4-byte stack array — correctly handles salts of any lengthsaltlen > 1<<20guard against DoS with huge saltsblf_encargument:sizeof(cdata)/sizeof(uint64_t)→BCRYPT_WORDS/2— same value (4) but eliminates the compiler warningtmpoutin the cleanup section (was missing in v1.13)blowfish.c v1.19 (2015) → v1.20 (2021):
The
bcrypt_pbkdf_ext.cRuby wrapper gets a matching fix for thebcrypt_hashsignature change (parameters are now non-const to match upstream).