SSLSocket: remove unnecessary connect() override, log and close socket on doHandshake SSLException #234
Conversation
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
…nce super equivalent calls connect(SocketAddress endpoint, int port)
… in startHandshake()
… for wolfSSL_X509_REQ_set_version()
JacobBarthelmeh
approved these changes
Nov 21, 2024
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.
This PR includes 2 code changes:
Socket.connect(SocketAddress endpoint).WolfSSLSocketextendsSocket, and the superconnect(SocketAddress endpoint)calls the existing override with timeout (connect(SocketAddress endpoint, int timeout). With this change,connect()in our code will only be called once, not twice.WolfSSLSocket.startHandshake(), whendoHandshake()fails with aSSLException, we now log the error code, and close the Socket before throwing the exception back up to the caller.These changes originated from user log analysis.
This also includes one change to the example Android Studio CMakeLists.txt, which was caught by PRB testing on this PR:
WOLFSSL_CERT_REQinCMakeLists.txt, needed for use ofwolfSSL_X509_REQ_set_version(). When using./configure --enable-jni, this is already added by configure.ac.