Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't allow a resumption handshake inside of a SCR #6557

Merged
merged 2 commits into from
Jul 10, 2023
Merged

Don't allow a resumption handshake inside of a SCR #6557

merged 2 commits into from
Jul 10, 2023

Conversation

julek-wolfssl
Copy link
Member

Fixes ZD16332

@julek-wolfssl julek-wolfssl self-assigned this Jun 29, 2023
rizlik
rizlik requested changes Jun 29, 2023
View reviewed changes
Copy link
Contributor

@rizlik rizlik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's the actual need for the ssl->options.resumed variable?
It will be true after a renegotiation. If we see a renegotiation as a new handshake, can we still consider the session as resumed?

src/internal.c Outdated Show resolved Hide resolved
src/internal.c Outdated Show resolved Hide resolved
@julek-wolfssl
Copy link
Member Author

retest this please

@julek-wolfssl
Copy link
Member Author

I feel that wolfSSL_session_reused should apply to how the initial handshake was established. That is why I introduced the additional ssl->options.resumed variable.

@julek-wolfssl julek-wolfssl requested a review from rizlik July 4, 2023 14:30
@julek-wolfssl julek-wolfssl assigned rizlik and unassigned julek-wolfssl Jul 5, 2023
@julek-wolfssl
Copy link
Member Author

Test failures are not related to this PR.

rizlik
rizlik previously approved these changes Jul 6, 2023
View reviewed changes
@rizlik rizlik assigned dgarske and unassigned rizlik Jul 6, 2023
@julek-wolfssl
Copy link
Member Author

Retest this please.

@dgarske dgarske assigned SparkiDev and unassigned dgarske Jul 7, 2023
@dgarske dgarske requested a review from SparkiDev July 7, 2023 00:11
@SparkiDev SparkiDev merged commit 9f6ef65 into wolfSSL:master Jul 10, 2023
64 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dgarske dgarske dgarske approved these changes

@rizlik rizlik rizlik approved these changes

@SparkiDev SparkiDev SparkiDev approved these changes

Assignees

@SparkiDev SparkiDev

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@julek-wolfssl @dgarske @rizlik @SparkiDev