Implement Provider for all loaders in tls::Server/Client #1668
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
camshaft
reviewed
Mar 16, 2023
quic/s2n-quic/src/provider/tls.rs
Outdated
| @@ -204,7 +204,7 @@ mod default_tls { | |||
| use super::*; | |||
| use crate::provider::tls; | |||
|
|
|||
| impl tls::Provider for Server { | |||
| impl<L: ConfigLoader> tls::Provider for Server<L> { | |||
There was a problem hiding this comment.
I think this will only work for s2n-tls. The rustls Server don't have a generic loader type. I'm surprised it didn't fail the windows build, which uses rustls by default. But that's a separate issue 😄
There was a problem hiding this comment.
Ah, interesting. I'll see if I can get the cfgs to cooperate, though testing the permutations here feels iffy.
There was a problem hiding this comment.
Moved the implementation to the s2n-tls provider block. I think it's probably best that this code isn't cfg'd for the actual resolved provider (i.e., if we default to s2n-tls we shouldn't change the impl on behalf of users).
This avoids users needing to reimplement the trait with a custom loader implementation.
Mark-Simulacrum
force-pushed
the
all-loaders-ok
branch
from
b69113e
to
e255bdc
Compare
camshaft
approved these changes
Mar 29, 2023
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.
This avoids users needing to reimplement the trait with a custom loader implementation.
Description of changes:
As noted in the title, just expands the implementation to all ConfigLoader's.
Testing:
I didn't run any particular tests - including even compiling this, since the feature gating makes that tricky in my environment. Hopefully CI is compiling this? If needed I will play with the options locally some more.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.