Fix connection options and update github pubkey #5120
Merged
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
As part of the "clear connection configuration for reused objects" patch, a ::stop would reset the self-signed, trust anchors, etc. WiFiClient, unfortunately, calls ::stop as part of the connection process, so all of these settings were lost. Now only clear the connection settings on ::stop if we've already been connected. Also update the github public key which changed yet again. Fixes esp8266#5086
6 tasks
d-a-v
approved these changes
Sep 11, 2018
devyte
reviewed
Sep 11, 2018
| @@ -179,7 +179,10 @@ void WiFiClientSecure::stop() { | |||
| _client->abort(); | |||
| } | |||
| WiFiClient::stop(); | |||
| _clearAuthenticationSettings(); | |||
| // Only if we've already connected, clear the connection options | |||
| if (_handshake_done) { | |||
There was a problem hiding this comment.
What happens if I set up a connection, attempting to connect fails (_handshake_done never becomes true), and then decide to abort and call stop()? Won't the flags remain?
What if the certs are then changed and a different connection is attempted? won't the previous flags be still there?
There was a problem hiding this comment.
Yes, that's a feature not a bug :)
In a connection loop in the main so you set the options and while (! Connected) try and connect. No need to reapply any settings since it hasn't moved further.
Due to the flow inside wificlient which calls stop even in connections that were never opened, I think this is the best we can do.
devyte
approved these changes
Sep 14, 2018
d-a-v
pushed a commit
to d-a-v/Arduino
that referenced
this pull request
Sep 18, 2018
As part of the "clear connection configuration for reused objects" patch, a ::stop would reset the self-signed, trust anchors, etc. WiFiClient, unfortunately, calls ::stop as part of the connection process, so all of these settings were lost. Now only clear the connection settings on ::stop if we've already been connected. Also update the github public key which changed yet again. Fixes esp8266#5086
6 tasks
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.
As part of the "clear connection configuration for reused objects"
patch, a ::stop would reset the self-signed, trust anchors, etc.
WiFiClient, unfortunately, calls ::stop as part of the connection
process, so all of these settings were lost.
Now only clear the connection settings on ::stop if we've already
been connected.
Also update the github public key which changed yet again.
Fixes #5086