Add php_hash_ops->is_crypto; disallow is_crypto=0 hashes in hash_hmac*(), hash_pbkdf2() #2312
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
nikic
reviewed
Jan 16, 2017
| @@ -46,6 +46,7 @@ typedef struct _php_hash_ops { | |||
| int digest_size; | |||
| int block_size; | |||
| int context_size; | |||
| int is_crypto; | |||
There was a problem hiding this comment.
Or maybe unsigned is_crypto : 1. Either is fine.
There was a problem hiding this comment.
Did the second, overwriting the old commit to keep it clean.
|
Imho no RFC is needed. These hashes don't make sense in hmac and can currently cause memory errors / segfaults, as we've seen in the fnv case. |
… hash_hmac*(), hash_pbkdf2()
narfbg
force-pushed
the
hash_crypto_flag
branch
from
d8c3a76 to
f6ba738
Compare
|
Merged via d89d149. Thanks! |
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 idea came from #1105, and replaces the temporary solution that was
php_hash_is_crypt().Obviously, it's a BC break compared to PHP 7.1 which allows checksum hashes to be used with
hash_hmac(),hash_hmac_file(),hash_pbkdf2()... should I write an RFC for that?