Skip to content

Commit

Permalink
Update *ring* to 0.6.19 (#758)
Browse files Browse the repository at this point in the history
Includes latest BoringSSL changes.
  • Loading branch information
olix0r authored Dec 2, 2020
1 parent d7faa87 commit c44027a
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1784,9 +1784,9 @@ checksum = "9cbca9424c482ee628fa549d9c812e2cd22f1180b9222c9200fdfa6eb31aecb2"

[[package]]
name = "once_cell"
version = "1.4.0"
version = "1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d"
checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"

[[package]]
name = "opencensus-proto"
Expand Down Expand Up @@ -2229,9 +2229,9 @@ dependencies = [

[[package]]
name = "ring"
version = "0.16.15"
version = "0.16.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "952cd6b98c85bbc30efa1ba5783b8abf12fec8b3287ffa52605b9432313e34e4"
checksum = "024a1e66fea74c66c66624ee5622a7ff0e4b73a13b4f5c326ddb50c708944226"
dependencies = [
"cc",
"libc",
Expand Down Expand Up @@ -2995,8 +2995,8 @@ dependencies = [

[[package]]
name = "webpki"
version = "0.21.2"
source = "git+https://github.com/linkerd/webpki?branch=cert-dns-names-0.21#bb241f5bf80a894d0899ad6719bab3d9d0660b61"
version = "0.21.3"
source = "git+https://github.com/linkerd/webpki?branch=cert-dns-names-0.21#b2c3bb3633f97280ae0503a79b501d51137dcb10"
dependencies = [
"ring",
"untrusted",
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,5 @@ debug = false
debug = false

[patch.crates-io]
webpki = { git = "https://github.com/linkerd/webpki", branch = "cert-dns-names-0.21" }
webpki = { git = "https://github.com/linkerd/webpki", branch = "cert-dns-names-0.21", rev = "b2c3bb3" }
tower = { version = "0.3", git = "https://github.com/tower-rs/tower", rev = "ad348d8" }
2 changes: 1 addition & 1 deletion linkerd/app/integration/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ tower = { version = "0.3", default-features = false}
tonic = { version = "0.3", default-features = false }
tracing = "0.1.19"
tracing-futures = { version = "0.2", features = ["std-future"] }
webpki = "0.21.0"
webpki = "0.21"

[dependencies.tracing-subscriber]
version = "0.2.14"
Expand Down
4 changes: 2 additions & 2 deletions linkerd/identity/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ test-util = []

[dependencies]
linkerd2-dns-name = { path = "../dns/name" }
ring = "0.16"
ring = "0.16.19"
rustls = "0.18"
tracing = "0.1.2"
untrusted = "0.7"
webpki = "0.21"
webpki = "=0.21.3"

0 comments on commit c44027a

Please sign in to comment.