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

quinn-proto v0.10.0 w/ rustls v0.21.0 #1515

Merged
merged 2 commits into from
Apr 1, 2023

Conversation

cpu
Copy link
Contributor

@cpu cpu commented Mar 15, 2023

Description

Update branch for quinn-proto v0.10.0, using Rustls v0.21.0

deps: upgrade rustls v0.20.3 -> v0.21.0.

This commit updates Quinn's dependency on Rustls from v0.20.3 to v0.21.0.

This release includes a handful of small breaking changes which are resolved alongside the upgrade.

quinn-proto: bump version 0.9.2 -> 0.10.0.

As part of upgrading the quinn-proto rustls dependency we must do a semver incompatible version bump since rustls is exposed as part of the public API.

Blocking tasks

  • Review
  • Wait for upstream Rustls v0.21.0 release
  • Replace patch with update to use released tag
  • Rebase on main

quinn-proto/src/crypto/rustls.rs Outdated Show resolved Hide resolved
quinn-proto/src/tests/mod.rs Outdated Show resolved Hide resolved
Copy link
Member

@djc djc left a comment

Choose a reason for hiding this comment

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

Thanks for starting on this!

Would be nice to squash most of these changes (except the one that seems like a technically unrelated bugfix), and also treat this branch/PR as the eventual upgrade PR (removing some of the test language from the PR title/description).

Also would be nice to include a separate commit that bumps the version number for quinn-proto to 0.10.0 (since we expose rustls publicly as part of our API, we need to do a semver-incompatible bump here if we make a semver-incompatible bump for rustls). The quinn crate already got one in #1502, so it doesn't need to be bumped.

quinn-proto/src/crypto/rustls.rs Show resolved Hide resolved
@djc djc mentioned this pull request Mar 16, 2023
2 tasks
@cpu cpu force-pushed the cpu-smoke-test-rustls-quic-conns branch 2 times, most recently from 25a1896 to 097835a Compare March 16, 2023 14:24
@cpu cpu changed the title DRAFT: deps: smoke-test rustls quic-conns branch. DRAFT: prepare quinn-proto v0.10.0 w/ rustls v0.21.0 Mar 16, 2023
@cpu cpu force-pushed the cpu-smoke-test-rustls-quic-conns branch from 097835a to 0ad878c Compare March 16, 2023 14:31
@cpu
Copy link
Contributor Author

cpu commented Mar 16, 2023

Would be nice to squash most of these changes (except the one that seems like a technically unrelated bugfix), and also treat this branch/PR as the eventual upgrade PR (removing some of the test language from the PR title/description).

☑️ - Done.

Also would be nice to include a separate commit that bumps the version number for quinn-proto to 0.10.0

☑️ - Done w/ 0ad878c

djc
djc previously approved these changes Mar 16, 2023
Ralith
Ralith previously approved these changes Mar 17, 2023
Copy link
Collaborator

@Ralith Ralith left a comment

Choose a reason for hiding this comment

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

Thanks!

@cpu
Copy link
Contributor Author

cpu commented Mar 22, 2023

cpu force-pushed the cpu-smoke-test-rustls-quic-conns branch from 0ad878c to e17beaa

I wanted to refresh this branch now that rustls/rustls#1216 was merged. I'm glad I did because it shook out a couple errors, now addressed in rustls/rustls#1236 I've switched the Patch to that branch for the short term.

@cpu cpu force-pushed the cpu-smoke-test-rustls-quic-conns branch from e17beaa to 429380a Compare March 22, 2023 14:04
@cpu
Copy link
Contributor Author

cpu commented Mar 22, 2023

cpu force-pushed the cpu-smoke-test-rustls-quic-conns branch from e17beaa to 429380a

Fixed one more breaking change from upstream:

error[E0432]: unresolved import `rustls::internal::msgs::enums::AlertDescription`
  --> quinn-proto/src/tests/mod.rs:13:5
   |
13 | use rustls::internal::msgs::enums::AlertDescription;
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `AlertDescription` in `msgs::enums`

@cpu cpu force-pushed the cpu-smoke-test-rustls-quic-conns branch from 429380a to d79ed33 Compare March 22, 2023 15:02
@cpu
Copy link
Contributor Author

cpu commented Mar 22, 2023

cpu force-pushed the cpu-smoke-test-rustls-quic-conns branch from 429380a to d79ed33

Now back to tracking rustls/main in the Patch since rustls/rustls#1236 was merged.

@cpu cpu force-pushed the cpu-smoke-test-rustls-quic-conns branch from d79ed33 to b6b3cf4 Compare March 29, 2023 18:33
cpu added 2 commits March 29, 2023 14:34
This commit updates Quinn's dependency on Rustls from v0.20.3 to
v0.21.0.

This release includes a handful of small breaking changes which are
resolved alongside the upgrade.
As part of upgrading the quinn-proto rustls dependency we must do
a semver incompatible version bump since rustls is exposed as part of
the public API.
@cpu cpu force-pushed the cpu-smoke-test-rustls-quic-conns branch from b6b3cf4 to 75229c3 Compare March 29, 2023 18:38
@cpu cpu changed the title DRAFT: prepare quinn-proto v0.10.0 w/ rustls v0.21.0 quinn-proto v0.10.0 w/ rustls v0.21.0 Mar 29, 2023
@cpu cpu marked this pull request as ready for review March 29, 2023 18:47
@cpu
Copy link
Contributor Author

cpu commented Mar 29, 2023

@djc @Ralith This branch should be ready to go now that Rustls 0.21.0 is available 🎉

Copy link
Member

@djc djc left a comment

Choose a reason for hiding this comment

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

Thanks!

Copy link
Collaborator

@Ralith Ralith left a comment

Choose a reason for hiding this comment

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

Thanks!

@Ralith Ralith merged commit b56d60b into quinn-rs:main Apr 1, 2023
@cpu cpu deleted the cpu-smoke-test-rustls-quic-conns branch April 1, 2023 19:28
@djc djc mentioned this pull request May 8, 2023
3 tasks
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