fix: incorrect group reported for TLS 1.2 session resumption#5673
Merged
fix: incorrect group reported for TLS 1.2 session resumption#5673
Conversation
* add header
* formatting
maddeleine
reviewed
Dec 17, 2025
Contributor
There was a problem hiding this comment.
Hmm okay I'm completely confused. Aren't you supposed to be fixing the s2n_connection_get_key_exchange_group? You seem to be fixing the deprecated API s2n_connection_get_curve. But how could your tests be passing unless you did fix the problem 🤔...
Sorry, crashed out there for a minute. s2n_connection_get_key_exchange_group calls s2n_connection_get_curve, which means you have to fix the latter to fix the former. I need to not do reviews before I have coffee 😪
* rename intermediate variables
* I wan't correctly handling expected errors
* merge issue
* this one was gated behind a feature
CarolYeh910
reviewed
Dec 31, 2025
alexw91
approved these changes
Dec 31, 2025
Co-authored-by: Carol Yeh <69044490+CarolYeh910@users.noreply.github.com>
CarolYeh910
approved these changes
Dec 31, 2025
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Goal
Fix #5672
Why
Currently, an incorrect group/curve is reported during TLS 1.2 session resumption. No DHE exchange takes places, so the group should be None, but instead the default curve was being reported.
How
I just added an additional check to the curve getter.
I also added an integration test confirming that we have the correct behavior.
release summary: Fixed an issue where selected_key_exchange_group for a resumed TLS 1.2 connection would incorrectly report secp256r1.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.