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

v0.12.0: update to rustls 0.22, address breaking changes #371

Merged
merged 4 commits into from
Dec 3, 2023

Conversation

cpu
Copy link
Member

@cpu cpu commented Dec 1, 2023

Updates rustls-ffi to use rustls 0.22. This branch retains ring as the only supported crypto provider. Subsequent work will allow selection of ring or aws_lc_rs as well as mixing/matching.

  • Version 0.11.1 -> 0.12.0
  • Rustls 0.22.0-alpha-6 -> 0.22.0
  • Webpki 0.102.0-alpha.8 -> 0.102.0
  • Rustls pki-types 0.2.3 -> 1.0
  • CryptoProvider is now a struct.
  • rustls::crypto::ring::RING is now rustls::crypto::ring::default_provider.
  • WebPkiServerVerifier's default fns are removed, rustls::crypto::{verify_tls12_signature|verify_tls13_signature} and rustls::crypto::WebPkiSupportedAlgorithms.supported_schemes can be used instead.
  • rustls::Error::Other now holds rustls::OtherError variant instead of Arc<...>.

@cpu cpu force-pushed the cpu-0.22-prep branch 4 times, most recently from 65135f7 to 38ca774 Compare December 1, 2023 19:02
@cpu cpu changed the title WIP: update to rustls 0.22, update breaking changes WIP: v0.12.0: update to rustls 0.22, update breaking changes Dec 1, 2023
@cpu cpu changed the title WIP: v0.12.0: update to rustls 0.22, update breaking changes WIP: v0.12.0: update to rustls 0.22, address breaking changes Dec 1, 2023
@cpu
Copy link
Member Author

cpu commented Dec 1, 2023

  • Updated the build.rs RUSTLS_CRATE_VERSION version to match Cargo.toml
  • Added a commit to bump the crate version to 0.12.0

@jsha
Copy link
Collaborator

jsha commented Dec 1, 2023

This looks good to me so far.

cpu added 2 commits December 2, 2023 13:10
It hasn't been used since the 0.22 preparation work that tracked
upstream changes w.r.t. scts in-handshake.
Now that 0.22 has been published we can directly link to the upstream
client/server cert verifier builder types.
cpu added 2 commits December 2, 2023 13:14
* Rustls 0.22.0-alpha-6 -> 0.22.0
* Webpki 0.102.0-alpha.8 -> 0.102.0
* Rustls pki-types 0.2.3 -> 1.0
* `CryptoProvider` is now a struct.
* `rustls::crypto::ring::RING` is now
  `rustls::crypto::ring::default_provider`.
* `WebPkiServerVerifier`'s default fns are removed,
  `rustls::crypto::{verify_tls12_signature|verify_tls13_signature}` and
  `rustls::crypto::WebPkiSupportedAlgorithms.supported_schemes` can be
  used instead.
* `rustls::Error::Other` now holds `rustls::OtherError` variant instead
  of `Arc<...>`.
@cpu cpu changed the title WIP: v0.12.0: update to rustls 0.22, address breaking changes v0.12.0: update to rustls 0.22, address breaking changes Dec 2, 2023
@cpu cpu marked this pull request as ready for review December 2, 2023 18:20
@cpu
Copy link
Member Author

cpu commented Dec 2, 2023

I believe this branch is ready, and we could merge it and publish 0.12.0. Alternatively, I'm almost done with a first draft for broader crypto provider support. We could also hold off on publishing 0.12.0 until that work is ready.

Copy link
Collaborator

@jsha jsha left a comment

Choose a reason for hiding this comment

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

This looks great. I'm inclined to release 0.12 without waiting for the additional crypto provider support. If you agree, would you push the release to crates.io when you get a chance?

@jsha jsha merged commit e474895 into rustls:main Dec 3, 2023
@cpu
Copy link
Member Author

cpu commented Dec 3, 2023

This looks great. I'm inclined to release 0.12 without waiting for the additional crypto provider support.

Sure, sounds good to me 👍

If you agree, would you push the release to crates.io when you get a chance?

I'd like to update the CHANGELOG first. I'll try to put a PR up for that shortly.

@cpu cpu deleted the cpu-0.22-prep branch December 3, 2023 14:55
@cpu
Copy link
Member Author

cpu commented Dec 3, 2023

I'd like to update the CHANGELOG first. I'll try to put a PR up for that shortly.

#372

@cpu
Copy link
Member Author

cpu commented Dec 6, 2023

If you agree, would you push the release to crates.io when you get a chance?

  • Pushed a 0.12.0 tag
  • Created a 0.12.0 GitHub release.
  • Published rustls-ffi v0.12.0 at registry crates-io

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