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.

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

Minimize TLS PRF upstream diffs #1439

Merged
merged 2 commits into from
Dec 13, 2024
Merged

Conversation

qmuntal
Copy link
Member

@qmuntal qmuntal commented Dec 12, 2024

Upstream did an importat refactor in the crypto/tls/prf.go file that produces a lot of conflicts in our patches. The main issue is that usptream PRF functions don't return an error, while the ones implemented on our backend do. Passing the error up means changing many signatures and call sites.

This PR reduces these future conflicts by panicking instead of returning an error. We then keep the previous behavior by recovering from the panic (if there is one) and lowering the panic into an error.

For #1416.
For #1383.

Copy link
Member

@gdams gdams left a comment

Choose a reason for hiding this comment

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

Great to see a shrinking patch! 🎉

patches/0002-Add-crypto-backend-foundation.patch Outdated Show resolved Hide resolved
@qmuntal qmuntal force-pushed the dev/qmuntal/prfnoerr branch from 71cbd38 to fa08c88 Compare December 13, 2024 08:12
@qmuntal qmuntal enabled auto-merge December 13, 2024 08:20
@qmuntal qmuntal merged commit ec76e31 into microsoft/main Dec 13, 2024
31 checks passed
@qmuntal qmuntal deleted the dev/qmuntal/prfnoerr branch December 13, 2024 08:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants