Fix a NULL dereference in chacha20_poly1305_init_key() #1049
+13
−9
Conversation
This file contains 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
chacha20_poly1305_init_key() dereferences NULL when called with inkey != NULL && iv == NULL. This function is called by EVP_EncryptInit_ex() family, whose documentation allows setting key and iv in separate calls.
|
+1 |
| /* pad on the left */ | ||
| memset(temp, 0, sizeof(temp)); | ||
| if (actx->nonce_len <= CHACHA_CTR_SIZE) | ||
| memcpy(temp + CHACHA_CTR_SIZE - actx->nonce_len, iv, actx->nonce_len); |
There was a problem hiding this comment.
Instead of reindenting everything, a more minimal change would be:
if (iv == NULL) {
chacha_init_key(ctx, inkey, NULL, enc);
return 1;
}There was a problem hiding this comment.
Yes, but I wanted to limit the scope of temp. If smaller diff is preferred I can change this :)
|
+1 |
mattcaswell
added
the
approval: done
|
Merged |
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.
chacha20_poly1305_init_key() dereferences NULL when called with inkey != NULL && iv == NULL. This function is called by EVP_EncryptInit_ex() family, whose documentation allows setting key and iv in separate calls.