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

hyper-rustls v0.24.0 w/ rustls 0.21.0 + tokio-rustls 0.24.0 #199

Merged
merged 2 commits into from
Mar 31, 2023
Merged

hyper-rustls v0.24.0 w/ rustls 0.21.0 + tokio-rustls 0.24.0 #199

merged 2 commits into from
Mar 31, 2023

Conversation

cpu
Copy link
Member

@cpu cpu commented Mar 22, 2023 •
edited
Loading

Description

This branch updates hyper-rustls to use a patch to track the yet-to-be-released 0.21.0 rustls work, both as a direct dependency and through an upgrade to tokio-rustls v0.24.0.

Remaining work

@djc
Copy link
Member

djc commented Mar 23, 2023

Nice!

@cpu cpu mentioned this pull request Mar 27, 2023
Merged
10 tasks
@cpu
Copy link
Member Author

cpu commented Mar 29, 2023

Rustls 0.21.0 was released. I will rebase this branch once tokio-rs/tls#137 lands so we can drop both cargo patches at once.

@cpu cpu mentioned this pull request Mar 29, 2023
Closed
@cpu cpu force-pushed the cpu-rustls-0.21.0-prep branch 2 times, most recently from 538c6a2 to 76cda54 Compare March 30, 2023 17:18
@cpu cpu mentioned this pull request Mar 30, 2023
Merged
13 tasks
@cpu
Copy link
Member Author

cpu commented Mar 30, 2023

Should I bump the patch version (0.23.2 -> 0.23.3) in this branch? I'm not 100% sure how necessary it is to publish a cargo release after landing this if there were no changes made to the internals.

@djc
Copy link
Member

djc commented Mar 31, 2023 •
edited
Loading

rustls types appear in the public hyper-rustls API (for example, ConnectorBuilder::with_tls_config()), so making a semver-incompatible bump to rustls means hyper-rustls also needs a semver-incompatible bump. This should become 0.24.0.

@cpu cpu force-pushed the cpu-rustls-0.21.0-prep branch from 76cda54 to 048e340 Compare March 31, 2023 13:49
@cpu
Copy link
Member Author

cpu commented Mar 31, 2023

so making a semver-incompatible bump to rustls means hyper-rustls also needs a semver-incompatible bump.

That makes sense, thanks!

This should become 0.24.0.

I rebased to remove the patch for tokio-rustls now that that crate has updated, and I added a commit (048e340) to update this crate's version to 0.24.0.

I think this is ready for review now :-)

@cpu cpu marked this pull request as ready for review March 31, 2023 13:50
@cpu cpu changed the title WIP: deps: update rustls v0.20.1 -> v0.21.0 hyper-rustls v0.24.0 w/ rustls 0.21.0 + tokio-rustls 0.24.0 Mar 31, 2023
@djc
Copy link
Member

djc commented Mar 31, 2023

webpki-roots 0.24.0 is out now, want to splice that into your first commit here?

cpu added 2 commits March 31, 2023 11:32
@cpu
deps: update rustls v0.20.1 -> v0.21.0
ec4399e 
This commit updates hyper-rustls to use the freshly released rustls
0.21.0.work.

We also use update to the recently released tokio-rustls v0.24.0 to
match rustls versions there, and to webpki-roots 0.23.0.
@cpu
crate: bump version from 0.23.2 -> 0.24.0.
6ec23cf 
The update to Rustls 0.21.0 was a semver incompatible bump, and since
types from that crate are part of our public API we must also bump the
hyper-rustls version accordingly.
@cpu cpu force-pushed the cpu-rustls-0.21.0-prep branch from 048e340 to 6ec23cf Compare March 31, 2023 15:33
@cpu
Copy link
Member Author

cpu commented Mar 31, 2023

webpki-roots 0.24.0 is out now, want to splice that into your first commit here?

Done (but it was 0.23.0 fwiw).

@cpu cpu mentioned this pull request Mar 31, 2023
Closed
@djc djc merged commit 70fa4c1 into rustls:main Mar 31, 2023
@cpu cpu deleted the cpu-rustls-0.21.0-prep branch March 31, 2023 18:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@cpu @djc