Correctly convert between openssl / boringssl and java cipher names w…#8485
Merged
normanmaurer merged 1 commit into4.1from Nov 14, 2018
Merged
Correctly convert between openssl / boringssl and java cipher names w…#8485normanmaurer merged 1 commit into4.1from
normanmaurer merged 1 commit into4.1from
Conversation
Member
Author
|
Also @rkapsi |
Member
|
@normanmaurer tested the branch, works! Thanks! |
Member
Author
|
@rkapsi <3 .... This was really a PITA to fix |
ca998bc to
1e4ed24
Compare
…hen using TLSv1.3 Motivation: We did not correctly convert between openssl / boringssl and java ciphers when using TLV1.3 which had different effects when either using openssl or boringssl. - When using openssl and TLSv1.3 we always returned SSL_NULL_WITH_NULL_NULL as cipher name - When using boringssl with TLSv1.3 we always returned an incorrect constructed cipher name which does not match what is defined by Java. Modifications: - Add correct mappings in CipherSuiteConverter for both openssl and boringssl - Add unit tests for CipherSuiteConvert - Add unit in SSLEngine which checks that we do not return SSL_NULL_WITH_NULL_NULL ever and that server and client returns the same cipher name. Result: Fixes #8477.
1e4ed24 to
a96f0cf
Compare
Member
Author
|
did adjust the tests a bit to even capture more stuff and verify. |
Member
Author
|
Merging as @rkapsi verified the fix |
| tlsv13Supported = true; | ||
| } | ||
|
|
||
| } catch (Exception ignore) { |
Member
There was a problem hiding this comment.
Considering there is much more logic in the Try block, I don't know it's still okay to ignore this. Maybe log?
Member
Author
There was a problem hiding this comment.
Let me just move most of it out of the block.
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.
…hen using TLSv1.3
Motivation:
We did not correctly convert between openssl / boringssl and java ciphers when using TLV1.3 which had different effects when either using openssl or boringssl.
Modifications:
Result:
Fixes #8477.