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

DTLS1.3: Adding missing checks and refactor #24345

Closed
wants to merge 3 commits into from
Closed

DTLS1.3: Adding missing checks and refactor #24345

wants to merge 3 commits into from

Conversation

fwh-dc
Copy link
Contributor

@fwh-dc fwh-dc commented May 8, 2024

I'd like these to go in after #22275. There are some missing checks.

@fwh-dc fwh-dc marked this pull request as draft May 13, 2024 17:57
@fwh-dc fwh-dc force-pushed the cleanup-dtls-1.3 branch 2 times, most recently from d213ad5 to 4cddfbb Compare May 17, 2024 07:09
@fwh-dc
Copy link
Contributor Author

fwh-dc commented May 17, 2024

@t8m @mattcaswell

Can you give a hint on how to fix the CI failure:

/usr/bin/ld: apps/openssl-bin-s_server.o: in function `psk_server_cb':
s_server.c:(.text+0x2ef1): undefined reference to `ssl_version_cmp'
clang: error: linker command failed with exit code 1 (use -v to see invocation)
make[1]: *** [Makefile:23267: apps/openssl] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:3495: build_sw] Error 2

@t8m
Copy link
Member

t8m commented May 17, 2024

You cannot call internal functions or macros such as SSL_CONNECTION_FROM_SSL() from the apps. You'll have to keep the original code.

@fwh-dc
Copy link
Contributor Author

fwh-dc commented May 17, 2024

You cannot call internal functions or macros such as SSL_CONNECTION_FROM_SSL() from the apps. You'll have to keep the original code.

Aha thanks for clarifying!
I'd like to fix the functionality with this code. I'll provide an alternative suggestion later.

t8m
t8m reviewed May 20, 2024
View reviewed changes
include/openssl/tls1.h Outdated Show resolved Hide resolved
@fwh-dc fwh-dc marked this pull request as ready for review May 21, 2024 17:26
@fwh-dc
Copy link
Contributor Author

fwh-dc commented May 21, 2024

@t8m @mattcaswell this is ready for a review :)

@t8m t8m added approval: review pending This pull request needs review by a committer approval: otc review pending This pull request needs review by an OTC member triaged: feature The issue/pr requests/adds a feature tests: deferred Tests will be added in a subsequent PR (label should be removed when the PR with tests is merged) triaged: refactor The issue/pr requests/implements refactoring tests: exempted The PR is exempt from requirements for testing and removed triaged: feature The issue/pr requests/adds a feature tests: deferred Tests will be added in a subsequent PR (label should be removed when the PR with tests is merged) labels May 22, 2024
t8m
t8m requested changes May 22, 2024
View reviewed changes
ssl/ssl_ciph.c Outdated Show resolved Hide resolved
ssl/statem/extensions_srvr.c Outdated Show resolved Hide resolved
ssl/statem/extensions_clnt.c Outdated Show resolved Hide resolved
@fwh-dc fwh-dc requested a review from t8m May 23, 2024 13:01
t8m
t8m requested changes May 23, 2024
View reviewed changes
ssl/ssl_ciph.c Outdated Show resolved Hide resolved
ssl/ssl_ciph.c Show resolved Hide resolved
ssl/statem/extensions_srvr.c Outdated Show resolved Hide resolved
@t8m t8m removed the approval: otc review pending This pull request needs review by an OTC member label May 23, 2024
@mattcaswell mattcaswell added approval: done This pull request has the required number of approvals and removed approval: review pending This pull request needs review by a committer labels May 29, 2024
@openssl-machine openssl-machine removed the approval: done This pull request has the required number of approvals label May 30, 2024
@openssl-machine openssl-machine added the approval: ready to merge The 24 hour grace period has passed, ready to merge label May 30, 2024
@openssl-machine
Copy link
Collaborator

This pull request is ready to merge

@t8m
Copy link
Member

t8m commented May 30, 2024

Merged to the feature branch. Thank you for your contribution.

@t8m t8m closed this May 30, 2024
openssl-machine pushed a commit that referenced this pull request May 30, 2024
@fwh-dc @t8m
Refactor code and fix a couple of missing DTLSv1.3 checks.
dcbf02b 
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #24345)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@t8m t8m t8m approved these changes

@mattcaswell mattcaswell mattcaswell approved these changes

Assignees
No one assigned
Labels
approval: ready to merge The 24 hour grace period has passed, ready to merge tests: exempted The PR is exempt from requirements for testing triaged: refactor The issue/pr requests/implements refactoring
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@fwh-dc @t8m @openssl-machine @mattcaswell