Fix the crash due to inconsistent enc_write_ctx on the 1.1.0 branch #2164
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
fix the error handling in ssl3_change_cipher_state
kroeckx
approved these changes
Jan 6, 2017
|
I assume this does not apply to the 1.0.2 branch and just 1.1.0 and master. |
levitte
approved these changes
Jan 23, 2017
levitte
pushed a commit
that referenced
this pull request
Jan 23, 2017
…n ssl3_change_cipher_state Reviewed-by: Kurt Roeckx <kurt@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from #2164)
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.
fix the error handling in ssl3_change_cipher_state
Checklist
Description of change
This pull request is for trunk and 1.1.0 branch.
It fixes #2114 by checking the error code of EVP_CipherInit_ex and returning
it to the application, which has to avoid calling SSL_shutdown in this case.
I have noticed a memory leak in ssl3_generate_key_block that was not
there in the 1.0.2 branch.