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

hyper-rustls 0.25 prep, rustls 0.22 update #242

Merged
merged 3 commits into from
Dec 6, 2023
Merged

Conversation

cpu
Copy link
Member

@cpu cpu commented Dec 2, 2023

Description

This branch updates to rustls 0.22 and bumps the crate version from 0.25.0-alpha.0 to 0.25, taking the following associated updates:

  • rustls 0.22.0-alpha-6 -> 0.22
  • pki-types 0.2 -> 1
  • tokio-rustls 0.25.0-alpha.4 -> 0.25
  • rustls-native-certs 0.7.0-alpha.3 -> 0.7
  • webpki-roots 0.26.0-alpha.2 -> 0.26
  • rustls-pemfile 2.0.0-alpha.2 -> 2

Breaking API changes are addressed as required. Notably, the with_provider_and_webpki_roots builder fn that accepts a custom provider and uses the safe default protocol versions is now fallible to account for a possible error if the provider's configuration is not compatible.

@cpu cpu self-assigned this Dec 2, 2023
@@ -22,9 +22,9 @@ impl AcceptorBuilder<WantsTlsConfig> {
AcceptorBuilder(WantsAlpn(config))
}

/// Use rustls [defaults][with_safe_defaults] without [client authentication][with_no_client_auth]
/// Use rustls default crypto provider and safe defaults without
Copy link
Member Author

@cpu cpu Dec 2, 2023

Choose a reason for hiding this comment

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

I think some of these doc updates in this branch that lose the doc link to the removed with_safe_defaults would benefit from pointing at the ring::default_provider fn where we could document the safe defaults better.

I'll chase this down before merge.

@djc
Copy link
Member

djc commented Dec 4, 2023

I think we should probably take the hyper 1 update before we release this?

Cargo.toml Outdated Show resolved Hide resolved
src/connector/builder.rs Show resolved Hide resolved
This commit updates to rustls 0.22, taking the following associated
updates:
* rustls 0.22.0-alpha-6 -> 0.22
* pki-types 0.2 -> 1
* tokio-rustls 0.25.0-alpha.4 -> 0.25
* rustls-native-certs 0.7.0-alpha.3 -> 0.7
* webpki-roots 0.26.0-alpha.2 -> 0.26
* rustls-pemfile 2.0.0-alpha.2 -> 2

Breaking API changes are addressed as required. Notably, the builder fns
that accept a custom provider and use the safe defaults are now fallible
to account for a possible error if the provider's configuration is not
compatible with the default safe protocol versions.
@djc
Copy link
Member

djc commented Dec 5, 2023

Is there a reason for this to still be draft?

@cpu
Copy link
Member Author

cpu commented Dec 5, 2023

Is there a reason for this to still be draft?

No, I suppose we can land this and figure out the hyper 1 update and release notes separately.

@cpu cpu marked this pull request as ready for review December 5, 2023 20:06
@cpu cpu changed the title WIP: hyper-rustls 0.25 prep, rustls 0.22 update hyper-rustls 0.25 prep, rustls 0.22 update Dec 5, 2023
@djc djc added this pull request to the merge queue Dec 6, 2023
Merged via the queue into rustls:main with commit 3883ec9 Dec 6, 2023
11 checks passed
@cpu cpu deleted the cpu-0.25-prep branch December 6, 2023 14:24
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