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

backport #2465 and #2470 to v2.203 #2471

Merged
merged 2 commits into from
Sep 18, 2023
Merged

Commits on Sep 18, 2023

  1. use rustls-webpki instead of linkerd/webpki (#2465)

    This commit changes the `linkerd-meshtls-rustls` crate to use the
    upstream `rustls-webpki` crate, maintained by Rustls, rather than our
    fork of `briansmith/webpki` from GitHub. Since `rustls-webpki` includes
    the change which was the initial motivation for the `linkerd/webpki`
    fork (rustls/webpki#42), we can now depend on upstream.
    
    Currently, we must take a Git dependency on `rustls-webpki`, since a
    release including a fix for an issue (rustls/webpki#167) which prevents
    `rustls-webpki` from parsing our test certificates has not yet been
    published. Once v0.101.5 of `rustls-webpki` is published (PR see
    rustls/webpki#170), we can remove the Git dep. For now, I've updated
    `cargo-deny` to allow the Git dependency.
    hawkw committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    a4ccd6f View commit details
    Browse the repository at this point in the history
  2. meshtls: use published rustls-webpki v0.101.5 (#2470)

    Now that [v0.101.5 of `rustls-webpki`][1] has been [published][2], we
    can now depend on the crate from crates.io. This allows us to remove the
    Git dependency on the branch preparing that release to be published,
    which allows us to remove the allowance for Git dependencies in the
    `cargo-deny` config.
    
    [1]: https://github.com/rustls/webpki/releases/tag/v%2F0.101.5
    [2]: https://crates.io/crates/rustls-webpki/0.101.5
    hawkw committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    5c7d1f7 View commit details
    Browse the repository at this point in the history