Fix conflict in ssl_cipher_list_to_bytes #24226
Closed
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
mattcaswell
added
branch: master
levitte
approved these changes
Apr 22, 2024
levitte
removed
the
approval: review pending
t8m
approved these changes
Apr 22, 2024
t8m
added
approval: done
openssl-machine
force-pushed
the
feature/dtls-1.3
branch
from
ba06dc9
to
fbea037
Compare
…ls1.3 Updated the logic in ssl_cipher_list_to_bytes to take account of the changes from PR#24161
|
I've rebased this onto the latest feature/dtls-1.3 branch. No other changes. I will assume that all approvals still hold. |
mattcaswell
force-pushed
the
fix-dtls13-conflict
branch
from
c46c5e9
to
acfd987
Compare
shahsb
approved these changes
Apr 22, 2024
mattcaswell
added
approval: ready to merge
|
Pushed. |
openssl-machine
pushed a commit
that referenced
this pull request
Apr 23, 2024
Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from #22366) Updated the logic in ssl_cipher_list_to_bytes to take account of the changes from PR#24161 Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from #24226)
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 is a squash commit to be merged to the feature/dtls-1.3 branch to enable that branch to be rebased on top of master once #24161 is merged there. IMO we should retain the orginal commit message and reviewed-by headers for the modified commit, and add this new commit description and reviewed-by headers from this PR onto the end of the commit description.
Once 24161 is merged to master, and this PR is merged to feature/dtls-1.3 we should immediately rebase feature/dtls-1.3 on the latest master.
Updated the logic in ssl_cipher_list_to_bytes to take account of the changes from PR#24161