SslHandler should call beginHanshake once for the initial handshake #4764
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
Motivation: Not all SSLEngine implementations permit beginHandshake being called while a handshake is in progress during the initial handshake. We should ensure we only go through the initial handshake code once to prevent unexpected exceptions from being thrown. Modifications: - Only call beginHandshake if there is not currently a handshake in progress Result: SslHandler's handshake method is compatible with OpenSSLEngineImpl in Android 5.0+ and 6.0+. Fixes netty#4718
|
@normanmaurer - PTAL @ganskef - Please verify. |
|
@Scottmitch LGTM |
|
@ganskef any luck testing if the issue is solved with this fix? |
|
Cherry-picked into 4.1 (e1d34ef) and 4.0 (cf2e829). @Scottmitch thanks! |
|
@Scottmitch thank you very much! I had a commented it at #4718. It works well now with Android 5.0, 5.1, and 6.0 on emulator and on a Nexus 5 with the latest Android from Google. I use it on Linux desktop with OpenJDK 7 for a week without notable issues. |
|
@ganskef - No problem .. thanks for reporting! |
ganskef
referenced
this pull request
in ganskef/LittleProxy-mitm
Feb 29, 2016
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.
Motivation:
Not all SSLEngine implementations permit beginHandshake being called while a handshake is in progress during the initial handshake. We should ensure we only go through the initial handshake code once to prevent unexpected exceptions from being thrown.
Modifications:
Result:
SslHandler's handshake method is compatible with OpenSSLEngineImpl in Android 5.0+ and 6.0+.
Fixes #4718