Workaround SSLEngine.unwrap(...) bug in Android 5.0#7761
Merged
Conversation
normanmaurer
requested review from
Scottmitch,
carl-mastrangelo,
ejona86,
nmittler and
trustin
Motivation: Android 5.0 sometimes not correctly update the bytesConsumed of the SSLEngineResult when consuming data from the input ByteBuffer. This will lead to handshake failures. Modifications: Add a workaround for Android 5.0 Result: Be able to use netty on Android 5.0 by fixing #7758 .
normanmaurer
force-pushed
the
android_unwrap_workaround
branch
from
cbc4dcf to
d0b43d1
Compare
Member
Author
|
@MarkVilkel reported it fixes his issues 👍 |
carl-mastrangelo
approved these changes
Mar 2, 2018
| // - https://android-review.googlesource.com/c/platform/external/conscrypt/+/122080 | ||
| // - https://github.com/netty/netty/issues/7758 | ||
| if (result.bytesConsumed() == 0) { | ||
| int consumed = inNioBuffer.position() - position; |
Member
There was a problem hiding this comment.
assert PlatformDependent.isAndroid();
?
Member
Author
There was a problem hiding this comment.
I can do this ... that said I am not sure its necessary. @carl-mastrangelo if you are strong on it I will add it.... WDYT ?
Member
Author
There was a problem hiding this comment.
ok let me merge it then
ejona86
approved these changes
Mar 2, 2018
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
3 participants
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:
Android 5.0 sometimes not correctly update the bytesConsumed of the SSLEngineResult when consuming data from the input ByteBuffer. This will lead to handshake failures.
Modifications:
Add a workaround for Android 5.0
Result:
Be able to use netty on Android 5.0 by fixing #7758 .