Fix RFC 7250 Compliance (#2257) #2274
Merged
+207
−167
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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #2274 +/- ##
==========================================
- Coverage 94.88% 94.88% -0.01%
==========================================
Files 103 103
Lines 24204 24201 -3
==========================================
- Hits 22965 22962 -3
Misses 1239 1239 ☔ View full report in Codecov by Sentry. |
a88b6e5 to
1cd38da
Compare
cpu
approved these changes
Dec 12, 2024
rustls/src/client/hs.rs
Outdated
| (true, false) => CertificateTypeExtensionNegotationResult::Err( | ||
| Error::PeerIncompatible(PeerIncompatible::IncorrectCertificateTypeExtension), | ||
| ), | ||
| (false, true) => CertificateTypeExtensionNegotationResult::Err( |
There was a problem hiding this comment.
The coverage gap flagged for this branch seems worth considering if it isn't too tricky. WDYT?
There was a problem hiding this comment.
To be honest I'm not sure if it should be possible to get to the (false, true) arm.
There are already api tests sending an unsolicited certificate type extension in the ServerHello, but then an UnsolicitedEncryptedExtension error is raised before even negotiating the certificate type.
If there is no way to get to that situation we could maybe remove the UnsolicitedCertificateTypeExtension, or I can write a small unit test.
Benchmark resultsInstruction countsSignificant differencesClick to expand
Other differencesClick to expand
Wall-timeSignificant differencesClick to expand
Other differencesClick to expand
Additional informationCheckout details:
|
djc
reviewed
Dec 13, 2024
ripatel-fd
pushed a commit
to firedancer-io/firedancer
that referenced
this pull request
Dec 18, 2024
d66af8b to
28515ec
Compare
djc
reviewed
Dec 19, 2024
28515ec to
0d5ccd9
Compare
djc
reviewed
Jan 6, 2025
b7fb5f6 to
ac45f3d
Compare
|
Just to check my understanding here: is this blocked on another round of iteration based on djc's most recent feedback? |
22fc4ac to
9c80f10
Compare
|
The semver test is failing, with the message |
@holodorum you can ignore that, sorry about the noise. It's a side-effect from #2288 (upstream issue: obi1kenobi/cargo-semver-checks#638) that will be resolved once we cut a rustls/rustls-post-quantum release, which should happen soon. |
9c80f10 to
e94b32b
Compare
|
I tried merging this with recent updates from main in brody4hire#8 - semver seems to be OK now. But codecov does seem to indicate some missing test coverage. I tried a couple mutations in brody4hire#8 based on the missing test coverage, they do not seem to trigger any CI testing failures. I think we need to add the missing test coverage. |
ctz
reviewed
Feb 5, 2025
6 tasks
e94b32b to
2f28d35
Compare
Updated logic to validate `client_certificate_type_extension` and `server_certificate_type_extension` in the ClientHello. Added an openssl interop test to replicate the issue and verify it's handled correctly. Co-authored-by: Adolfo Ochagavía <github@adolfo.ochagavia.nl>
2f28d35 to
fa3e317
Compare
ctz
approved these changes
Feb 6, 2025
Thank you all too for the feedback and patience😁 |
1 task
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 pull requests fixes issue #2257 by changing the way the server validates the
client_certificate_type_extensionand theserver_certificate_type_extensionin theServerHello.Considerations
common_stateand validated the negotation of raw keys only, hence we called the structRawKeyNegotationParams. The validation logic is different for the server and client now and we are not only negotiating raw keys, I moved this toclient::hs::CertificateTypeExtensionParamsandserver::hs::CertificateTypeExtensionParams.