Make SSL_clear_options pass new options to record layer #23045
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
t8m
approved these changes
Dec 14, 2023
t8m
added
branch: master
hlandau
approved these changes
Dec 18, 2023
hlandau
added
approval: done
mattcaswell
requested changes
Dec 18, 2023
mattcaswell
requested changes
Dec 18, 2023
ssl/ssl_lib.c
Outdated
| @@ -6023,6 +6023,7 @@ uint64_t SSL_set_options(SSL *s, uint64_t op) | |||
|
|
|||
| /* Ignore return value */ | |||
| sc->rlayer.rrlmethod->set_options(sc->rlayer.rrl, options); | |||
| sc->rlayer.rrlmethod->set_options(sc->rlayer.wrl, options); | |||
There was a problem hiding this comment.
This should be wrlmethod here.
ssl/ssl_lib.c
Outdated
|
|
||
| /* Ignore return value */ | ||
| sc->rlayer.rrlmethod->set_options(sc->rlayer.rrl, options); | ||
| sc->rlayer.rrlmethod->set_options(sc->rlayer.wrl, options); |
|
24 hours has passed since 'approval: done' was set, but as this PR has been updated in that time the label 'approval: ready to merge' is not being automatically set. Please review the updates and set the label manually. |
Signed-off-by: lan1120 <lanming@huawei.com>
hlandau
added
approval: review pending
hlandau
approved these changes
Dec 19, 2023
|
Needs reapproval |
hlandau
removed
the
approval: otc review pending
mattcaswell
approved these changes
Dec 19, 2023
t8m
approved these changes
Dec 19, 2023
t8m
added
approval: done
openssl-machine
added
approval: ready to merge
|
This pull request is ready to merge |
|
Pushed to master and 3.2. Thanks. |
openssl-machine
pushed a commit
that referenced
this pull request
Dec 20, 2023
Signed-off-by: lan1120 <lanming@huawei.com> Reviewed-by: Hugo Landau <hlandau@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from #23045)
wanghao75
pushed a commit
to openeuler-mirror/openssl
that referenced
this pull request
Dec 22, 2023
Signed-off-by: lan1120 <lanming@huawei.com> Reviewed-by: Hugo Landau <hlandau@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from openssl/openssl#23045) Signed-off-by: lanming1120 <lanming1120@126.com>
wanghao75
pushed a commit
to openeuler-mirror/openssl
that referenced
this pull request
Dec 22, 2023
Signed-off-by: lan1120 <lanming@huawei.com> Reviewed-by: Hugo Landau <hlandau@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from openssl/openssl#23045) (cherry picked from commit e8e95f20a9b00ca62d407263110663eba7614683) Signed-off-by: lanming1120 <lanming1120@126.com>
wbeck10
pushed a commit
to wbeck10/openssl
that referenced
this pull request
Jan 8, 2024
Signed-off-by: lan1120 <lanming@huawei.com> Reviewed-by: Hugo Landau <hlandau@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from openssl#23045)
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.
Make SSL_clear_options pass new options to record layer, so we can more flexibly control certain features, such as DTLS record replay check.