diff --git a/Cargo.lock b/Cargo.lock index 3f0a58c6603ba..f493999b35e78 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -493,7 +493,7 @@ dependencies = [ "serde", "serde_urlencoded 0.6.1", "url", - "webpki", + "webpki 0.21.4", "webpki-roots 0.19.0", "wildmatch", ] @@ -763,44 +763,45 @@ dependencies = [ [[package]] name = "bollard" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a3f238d4b66f33d9162893ade03cd8a485320f591b244ea5b7f236d3494e98" +checksum = "1b1d4b9e55620571c2200f4be87db2a9a69e2a107fc7d206a6accad58c3536cb" dependencies = [ "base64 0.13.0", "bollard-stubs", "bytes 1.1.0", "chrono", - "ct-logs", "dirs-next", "futures-core", "futures-util", "hex", "http", "hyper", - "hyper-rustls", + "hyper-rustls 0.23.0", "hyperlocal", "log", - "pin-project 1.0.8", - "rustls 0.19.1", - "rustls-native-certs", + "pin-project-lite", + "rustls 0.20.6", + "rustls-native-certs 0.6.2", + "rustls-pemfile 0.3.0", "serde", "serde_derive", "serde_json", "serde_urlencoded 0.7.0", "thiserror", "tokio", - "tokio-util", + "tokio-util 0.7.2", "url", - "webpki-roots 0.21.1", + "webpki 0.22.0", + "webpki-roots 0.22.3", "winapi 0.3.9", ] [[package]] name = "bollard-stubs" -version = "1.41.0" +version = "1.42.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed2f2e73fffe9455141e170fb9c1feb0ac521ec7e7dcd47a7cab72a658490fb8" +checksum = "4295240332c78d04291f3ac857a281d5534a8e036f3dfcdaa294b22c0d424427" dependencies = [ "chrono", "serde", @@ -1132,7 +1133,7 @@ dependencies = [ "memchr", "pin-project-lite", "tokio", - "tokio-util", + "tokio-util 0.6.8", ] [[package]] @@ -1515,15 +1516,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "ct-logs" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8" -dependencies = [ - "sct", -] - [[package]] name = "ctor" version = "0.1.21" @@ -2570,7 +2562,7 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util", + "tokio-util 0.6.8", "tracing 0.1.29", ] @@ -2944,15 +2936,28 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" dependencies = [ - "ct-logs", "futures-util", "hyper", "log", "rustls 0.19.1", - "rustls-native-certs", "tokio", - "tokio-rustls", - "webpki", + "tokio-rustls 0.22.0", + "webpki 0.21.4", +] + +[[package]] +name = "hyper-rustls" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" +dependencies = [ + "http", + "hyper", + "log", + "rustls 0.20.6", + "rustls-native-certs 0.6.2", + "tokio", + "tokio-rustls 0.23.4", ] [[package]] @@ -3837,14 +3842,14 @@ dependencies = [ "take_mut", "thiserror", "tokio", - "tokio-rustls", - "tokio-util", + "tokio-rustls 0.22.0", + "tokio-util 0.6.8", "trust-dns-proto", "trust-dns-resolver", "typed-builder 0.9.1", "uuid", "version_check", - "webpki", + "webpki 0.21.4", "webpki-roots 0.21.1", ] @@ -3911,8 +3916,8 @@ dependencies = [ "parking_lot", "regex", "rustls 0.19.1", - "rustls-native-certs", - "webpki", + "rustls-native-certs 0.5.0", + "webpki 0.21.4", "winapi 0.3.9", ] @@ -4556,9 +4561,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" [[package]] name = "pin-utils" @@ -4930,7 +4935,7 @@ dependencies = [ "regex", "tokio", "tokio-native-tls", - "tokio-util", + "tokio-util 0.6.8", "url", ] @@ -5230,7 +5235,7 @@ dependencies = [ "pin-project-lite", "tokio", "tokio-native-tls", - "tokio-util", + "tokio-util 0.6.8", "url", ] @@ -5319,7 +5324,7 @@ dependencies = [ "http", "http-body", "hyper", - "hyper-rustls", + "hyper-rustls 0.22.1", "hyper-tls", "ipnet", "js-sys", @@ -5335,7 +5340,7 @@ dependencies = [ "serde_urlencoded 0.7.0", "tokio", "tokio-native-tls", - "tokio-rustls", + "tokio-rustls 0.22.0", "url", "wasm-bindgen", "wasm-bindgen-futures", @@ -5671,8 +5676,8 @@ dependencies = [ "base64 0.12.3", "log", "ring", - "sct", - "webpki", + "sct 0.6.1", + "webpki 0.21.4", ] [[package]] @@ -5684,8 +5689,20 @@ dependencies = [ "base64 0.13.0", "log", "ring", - "sct", - "webpki", + "sct 0.6.1", + "webpki 0.21.4", +] + +[[package]] +name = "rustls" +version = "0.20.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" +dependencies = [ + "log", + "ring", + "sct 0.7.0", + "webpki 0.22.0", ] [[package]] @@ -5700,6 +5717,36 @@ dependencies = [ "security-framework", ] +[[package]] +name = "rustls-native-certs" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" +dependencies = [ + "openssl-probe", + "rustls-pemfile 1.0.0", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee86d63972a7c661d1536fefe8c3c8407321c3df668891286de28abcd087360" +dependencies = [ + "base64 0.13.0", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9" +dependencies = [ + "base64 0.13.0", +] + [[package]] name = "rustversion" version = "1.0.5" @@ -5810,6 +5857,16 @@ dependencies = [ "untrusted", ] +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "seahash" version = "4.1.0" @@ -6888,7 +6945,7 @@ dependencies = [ "postgres-types", "socket2 0.4.2", "tokio", - "tokio-util", + "tokio-util 0.6.8", ] [[package]] @@ -6899,7 +6956,18 @@ checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ "rustls 0.19.1", "tokio", - "webpki", + "webpki 0.21.4", +] + +[[package]] +name = "tokio-rustls" +version = "0.23.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +dependencies = [ + "rustls 0.20.6", + "tokio", + "webpki 0.22.0", ] [[package]] @@ -6911,7 +6979,7 @@ dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util", + "tokio-util 0.6.8", ] [[package]] @@ -6957,6 +7025,20 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-util" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f988a1a1adc2fb21f9c12aa96441da33a1728193ae0b95d2be22dbd17fcb4e5c" +dependencies = [ + "bytes 1.1.0", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing 0.1.29", +] + [[package]] name = "toml" version = "0.5.8" @@ -6988,9 +7070,9 @@ dependencies = [ "prost", "prost-derive", "tokio", - "tokio-rustls", + "tokio-rustls 0.22.0", "tokio-stream", - "tokio-util", + "tokio-util 0.6.8", "tower", "tower-layer", "tower-service", @@ -7025,7 +7107,7 @@ dependencies = [ "slab", "tokio", "tokio-stream", - "tokio-util", + "tokio-util 0.6.8", "tower-layer", "tower-service", "tracing 0.1.29", @@ -7671,7 +7753,7 @@ dependencies = [ "tokio-postgres", "tokio-stream", "tokio-test", - "tokio-util", + "tokio-util 0.6.8", "toml", "tonic", "tonic-build", @@ -7776,7 +7858,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-test", - "tokio-util", + "tokio-util 0.6.8", "toml", "tower", "tracing 0.1.29", @@ -8023,7 +8105,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-tungstenite", - "tokio-util", + "tokio-util 0.6.8", "tower-service", "tracing 0.1.29", ] @@ -8143,13 +8225,23 @@ dependencies = [ "untrusted", ] +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "webpki-roots" version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8eff4b7516a57307f9349c64bf34caa34b940b66fed4b2fb3136cb7386e5739" dependencies = [ - "webpki", + "webpki 0.21.4", ] [[package]] @@ -8158,7 +8250,16 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" dependencies = [ - "webpki", + "webpki 0.21.4", +] + +[[package]] +name = "webpki-roots" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d8de8415c823c8abd270ad483c6feeac771fad964890779f9a8cb24fbbc1bf" +dependencies = [ + "webpki 0.22.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 2870537c018db..dee818a8b986c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -199,7 +199,7 @@ async-compression = { version = "0.3.7", default-features = false, features = [" avro-rs = { version = "0.13.0", default-features = false, optional = true } base64 = { version = "0.13.0", default-features = false, optional = true } bloom = { version = "0.3.2", default-features = false, optional = true } -bollard = { version = "0.11.0", default-features = false, features = ["ssl"], optional = true } +bollard = { version = "0.12.0", default-features = false, features = ["ssl"], optional = true } bytes = { version = "1.1.0", default-features = false, features = ["serde"] } bytesize = { version = "1.1.0", default-features = false } chrono = { version = "0.4.19", default-features = false, features = ["serde"] }