-
Notifications
You must be signed in to change notification settings - Fork 87
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
update rustls v0.20.7 -> v0.21.0 #137
Conversation
This commit 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 a WIP upgrade[0] to tokio-rustls. [0]: tokio-rs/tls#137
0.21.0 has just been released |
Thanks, will update shortly. |
131d42b
to
4147274
Compare
I've updated this branch to use the released 0.21.0 Rustls tag. It still includes #133, so I think it would be prudent to have that work merged first and I can rebase afterwards. |
Want to add a commit that bumps the version? |
Done: f82c14e |
This commit updates hyper-rustls to use the freshly released rustls 0.21.0.work. We also use a patch to pick up a WIP upgrade[0] to tokio-rustls to match rustls versions there. [0]: tokio-rs/tls#137
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Replace the webpki dependency with rustls-webpki? |
I think we should remove dependencies and features reexport. |
4e4f7ab
to
e06509a
Compare
👍 Done.
@quininer I think the features that are re-exported from rustls are probably useful for consumers. Perhaps we could discuss this change separately from the update if its something you could describe in more detail in a separate issue? |
I added another commit (642bba3) to this branch to fix a flaky test I noticed failed after updating the webpki crate to the rustls fork. |
This commit updates tokio-rustls to use the freshly released Rustls 0.21.0 release tag, and the rustls-webpki fork of webpki.
Previously the `test_0rtt` test had a hardcoded 1s sleep waiting for an `openssl s_server` process to become ready. If 1s waiting wasn't long enough, the test could fail with an error like: ``` Error: Os { code: 10061, kind: ConnectionRefused, message: "No connection could be made because the target machine actively refused it." } ``` This commit replaces the hardcoded sleep with a sleep loop that gradually increases the delay time up to a fixed maximum. This makes the test run faster when the server is ready quickly and prevents an error if it takes longer than 1s to stabilize.
642bba3
to
f82c14e
Compare
It is not hard for users to import rustls themselves, I think it is not very useful and error-prone to maintain it downstream. It's good to merge this MR in this way, and we can discuss it in other MRs. |
Hey folks, thanks for quick turn around on this upgrade. When can we expect a new version be published to crates.io? |
@bartlomieju in the next few days, probably. |
@bartlomieju It looks like 0.24.0 is available in crates.io now. |
Description
This branch updates tokio-rustls to use the freshly released Rustls 0.21.0 release tag.
deps: update to rustls 0.21.0.
This commit updates tokio-rustls to use the freshly released Rustls 0.21.0 release tag, and the rustls-webpki fork of webpki.
tests: improve server wait in early data test.
Previously the
test_0rtt
test had a hardcoded 1s sleep waiting for anopenssl s_server
process to become ready.If 1s waiting wasn't long enough, the test could fail with an error like:
This commit replaces the hardcoded sleep with a sleep loop that gradually increases the delay time up to a fixed maximum. This makes the test run faster when the server is ready quickly and prevents an error if it takes longer than 1s to stabilize.
version: 0.23.4 -> 0.24.0
This commit bumps the tokio-rustls version from 0.23.4 to 0.24.0