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.

Sign up for GitHub

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

Upgrade webpki and rustls-webpki crates #3728

Merged
merged 5 commits into from
Sep 5, 2023
Merged

Upgrade webpki and rustls-webpki crates #3728

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0b94744
Upgrade webpki and rustls-webpki crates
SimonSapin Sep 4, 2023
5833a38
Merge branch 'dev' into simon/pkiup
Geal Sep 5, 2023
fde03d0
Remove unrelated dependency changes
Geal Sep 5, 2023
adb9ca0
remove exemptions for the webpki advisories
Geal Sep 5, 2023
a034d43
Merge branch 'dev' into simon/pkiup
Geal Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .changesets/maint_simon_pkiup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
### Upgrade webpki and rustls-webpki crates ([PR #3728](https://github.com/apollographql/router/pull/3728))

Brings fixes for:

* https://rustsec.org/advisories/RUSTSEC-2023-0052
* https://rustsec.org/advisories/RUSTSEC-2023-0053

Because Apollo Router does not accept client certificates, it could only be affected
if a subgraph supplied a pathological TLS server certificate.

By [@SimonSapin](https://github.com/SimonSapin) in https://github.com/apollographql/router/pull/3728
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7199,9 +7199,9 @@ dependencies = [

[[package]]
name = "webpki"
version = "0.22.0"
version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e"
dependencies = [
"ring",
"untrusted",
Expand Down
5 changes: 1 addition & 4 deletions deny.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ git-fetch-with-cli = true
# while https://github.com/chronotope/chrono/issues/499 is open.
# We need to keep track of this issue, and make sure `tracing-subscriber` is updated
# We will then be able to remove this
#
# RUSTSEC-2023-0052 and RUSTSEC-2023-0053 are pending a webpki update that is tracked by https://github.com/apollographql/router/issues/3645
# and will be fixed by https://github.com/apollographql/router/pull/3643
ignore = ["RUSTSEC-2020-0159", "RUSTSEC-2020-0071", "RUSTSEC-2023-0053", "RUSTSEC-2023-0052"]
ignore = ["RUSTSEC-2020-0159", "RUSTSEC-2020-0071"]

# This section is considered when running `cargo deny check licenses`
# More documentation for the licenses section can be found here:
Expand Down
8 changes: 4 additions & 4 deletions xtask/Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1196,9 +1196,9 @@ dependencies = [

[[package]]
name = "rustls-webpki"
version = "0.101.3"
version = "0.101.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "261e9e0888cba427c3316e6322805653c9425240b6fd96cee7cb671ab70ab8d0"
checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d"
dependencies = [
"ring",
"untrusted",
Expand Down Expand Up @@ -1732,9 +1732,9 @@ dependencies = [

[[package]]
name = "webpki"
version = "0.22.0"
version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e"
dependencies = [
"ring",
"untrusted",
Expand Down