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

feat: updates for rustls 0.23 #9

Merged
merged 4 commits into from
Mar 20, 2024
Merged

feat: updates for rustls 0.23 #9

merged 4 commits into from
Mar 20, 2024

Conversation

jbr
Copy link
Contributor

@jbr jbr commented Mar 4, 2024

This PR is an attempt at updating futures-rustls for rustls 0.23.

Let me know if you'd like me to split any of these out into distinct PRs or to back them out of this PR.

src/client.rs Show resolved Hide resolved
src/common/mod.rs Show resolved Hide resolved
src/server.rs Show resolved Hide resolved
@quininer
Copy link
Member

quininer commented Mar 5, 2024

I hope that futures-rustls and tokio-rustls keep isomorphic in implement to reduce maintenance costs.

You can refer to this to implement it. rustls/tokio-rustls#44

@jbr
Copy link
Contributor Author

jbr commented Mar 5, 2024

Specifically you mean adding a variant instead of using an option? Will do.

Why don't these crates share code if they're intended to be largely identical? Or have one crate and enable the async traits with a feature flag? Or at the least keep them in a shared workspace folks remember to update both?

I also believe there's a bug in the other implementation, in that it doesn't check if the alert returns WouldBlock and return pending. Should I PR that over there?

@jbr
Copy link
Contributor Author

jbr commented Mar 5, 2024

Switched to using a MidHandshake::SendAlert variant instead of a MidHandshake::Error { alert: Option<AcceptedAlert>,.. }

@jbr
Copy link
Contributor Author

jbr commented Mar 15, 2024

@quininer @djc Is this PR good to go? I believe it tracks all of the changes that have been made in tokio-rustls for rustls 0.23

@quininer
Copy link
Member

There are some other changes in tokio-rustls (poll_shutdown, vectored write), would you like to work on it in this PR?

@jbr
Copy link
Contributor Author

jbr commented Mar 19, 2024

@quininer added cb69b96 and 02417c3 with vectored_write and poll_close changes from tokio-rustls

@quininer
Copy link
Member

I'll take a look tonight.

@quininer quininer merged commit 7912262 into rustls:master Mar 20, 2024
@quininer
Copy link
Member

Thank you!

@cpu cpu mentioned this pull request Mar 21, 2024
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.

2 participants