fix: default s2nc should accept default s2nd cert #4670
Merged
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
WesleyRosenblum
approved these changes
Jul 29, 2024
Comment on lines
+495
to
+500
| if (is_localhost) { | ||
| bool match = (strcasecmp(host_name, "localhost") == 0); | ||
| match |= (strcasecmp(host_name, "127.0.0.1") == 0); | ||
| /* Some of our older test certificates use odd common names */ | ||
| match |= (strcasecmp(host_name, "s2nTestServer") == 0); | ||
| return (uint8_t) match; |
There was a problem hiding this comment.
this was added just as an additional sanity check?
There was a problem hiding this comment.
I'm not sure I'd call it an additional sanity check. The verify_host callback has to accept the certificate. Before it was rejecting it because the common name was s2nTestServer. But I suppose you could call it a sanity check since it'd probably be just as valid to implement verify_host to accept any host name when connecting to localhost.
maddeleine
approved these changes
Jul 29, 2024
Co-authored-by: Wesley Rosenblum <55108558+WesleyRosenblum@users.noreply.github.com>
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.
Resolved issues:
#4660 (reply in thread)
Description of changes:
s2nd is built with a default, hard-coded certificate chain, but by default s2nc does not trust that certificate chain. This change adds the default certificate chain's CA to s2nc's default trust store.
Testing:
Running
s2nc localhost 8000againsts2nd localhost 8000now works.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.