From 2e50ad1e9908ac98ca1ebdb6c257c5bd4af481a3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 5 Jan 2021 18:24:44 +0000 Subject: [PATCH] Bump reqwest from 0.10.10 to 0.11.0 Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.10.10 to 0.11.0. - [Release notes](https://github.com/seanmonstar/reqwest/releases) - [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md) - [Commits](https://github.com/seanmonstar/reqwest/compare/v0.10.10...v0.11.0) Signed-off-by: dependabot-preview[bot] --- Cargo.lock | 293 ++++++++++++++---- .../enclave-ra/ra-sp-server/Cargo.toml | 2 +- 2 files changed, 232 insertions(+), 63 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 035fd43c6..1b5a8a3b8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,7 +14,7 @@ dependencies = [ "protobuf", "protobuf-codegen-pure", "tokio 0.2.22", - "tokio-util", + "tokio-util 0.3.1", ] [[package]] @@ -317,12 +317,6 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - [[package]] name = "base64" version = "0.13.0" @@ -518,6 +512,12 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1" +[[package]] +name = "bytes" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f8e949d755f9d79112b5bb46938e0ef9d3804a0b16dfab13aafcaa5f0fa72" + [[package]] name = "cast" version = "0.2.3" @@ -849,7 +849,7 @@ dependencies = [ "ra-client", "rand 0.7.3", "rust-argon2 0.8.3", - "rustls 0.19.0", + "rustls", "secp256k1", "secstr", "serde", @@ -1560,7 +1560,7 @@ dependencies = [ "ra-client", "ra-enclave", "rand 0.7.3", - "rustls 0.19.0", + "rustls", "sgx-isa", "webpki", "zeroize", @@ -2012,7 +2012,27 @@ dependencies = [ "log", "slab", "tokio 0.2.22", - "tokio-util", + "tokio-util 0.3.1", +] + +[[package]] +name = "h2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b67e66362108efccd8ac053abafc8b7a8d86a37e6e48fc4f6f7485eb5e9e6a5" +dependencies = [ + "bytes 1.0.0", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.1", + "indexmap", + "slab", + "tokio 1.0.1", + "tokio-util 0.6.0", + "tracing", + "tracing-futures", ] [[package]] @@ -2164,6 +2184,16 @@ dependencies = [ "http 0.2.1", ] +[[package]] +name = "http-body" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2861bd27ee074e5ee891e8b539837a9430012e249d7f0ca2d795650f579c1994" +dependencies = [ + "bytes 1.0.0", + "http 0.2.1", +] + [[package]] name = "httparse" version = "1.3.4" @@ -2189,6 +2219,12 @@ dependencies = [ "void", ] +[[package]] +name = "httpdate" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" + [[package]] name = "humantime" version = "1.3.0" @@ -2258,18 +2294,41 @@ dependencies = [ "want 0.3.0", ] +[[package]] +name = "hyper" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12219dc884514cb4a6a03737f4413c0e01c23a1b059b0156004b23f1e19dccbe" +dependencies = [ + "bytes 1.0.0", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.3.0", + "http 0.2.1", + "http-body 0.4.0", + "httparse", + "httpdate", + "itoa", + "pin-project 1.0.1", + "socket2", + "tokio 1.0.1", + "tower-service", + "tracing", + "want 0.3.0", +] + [[package]] name = "hyper-rustls" -version = "0.21.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37743cc83e8ee85eacfce90f2f4102030d9ff0a95244098d781e9bee4a90abb6" +checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" dependencies = [ - "bytes 0.5.4", "futures-util", - "hyper 0.13.5", + "hyper 0.14.2", "log", - "rustls 0.18.1", - "tokio 0.2.22", + "rustls", + "tokio 1.0.1", "tokio-rustls", "webpki", ] @@ -2651,7 +2710,7 @@ dependencies = [ "log", "protobuf", "protoc-rust-grpc", - "reqwest", + "reqwest 0.10.10", "serde", "thiserror", ] @@ -2872,6 +2931,19 @@ dependencies = [ "winapi 0.2.8", ] +[[package]] +name = "mio" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e50ae3f04d169fcc9bde0b547d1c205219b7157e07ded9c5aff03e0637cb3ed7" +dependencies = [ + "libc", + "log", + "miow 0.3.6", + "ntapi", + "winapi 0.3.8", +] + [[package]] name = "mio-named-pipes" version = "0.1.6" @@ -2879,8 +2951,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5e374eff525ce1c5b7687c4cef63943e7686524a387933ad27ca7ec43779cb3" dependencies = [ "log", - "mio", - "miow 0.3.4", + "mio 0.6.22", + "miow 0.3.6", "winapi 0.3.8", ] @@ -2892,7 +2964,7 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" dependencies = [ "iovec", "libc", - "mio", + "mio 0.6.22", ] [[package]] @@ -2909,9 +2981,9 @@ dependencies = [ [[package]] name = "miow" -version = "0.3.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22dfdd1d51b2639a5abd17ed07005c3af05fb7a2a3b1a1d0d7af1000a520c1c7" +checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" dependencies = [ "socket2", "winapi 0.3.8", @@ -2944,7 +3016,7 @@ dependencies = [ "rand 0.7.3", "ring", "rs-libc", - "rustls 0.19.0", + "rustls", "secrecy", "sha2 0.9.1", "static_assertions 1.1.0", @@ -3048,6 +3120,15 @@ dependencies = [ "version_check", ] +[[package]] +name = "ntapi" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a31937dea023539c72ddae0e3571deadc1414b300483fa7aaec176168cfa9d2" +dependencies = [ + "winapi 0.3.8", +] + [[package]] name = "num-bigint" version = "0.2.6" @@ -3656,7 +3737,7 @@ dependencies = [ "der-parser", "lazy_static", "ra-common", - "rustls 0.19.0", + "rustls", "serde_json", "sgx-isa", "thiserror", @@ -3687,7 +3768,7 @@ dependencies = [ "ra-sp-client", "rcgen", "ring", - "rustls 0.19.0", + "rustls", "serde_json", "sgx-isa", "sha2 0.9.1", @@ -3714,7 +3795,7 @@ dependencies = [ "log", "percent-encoding", "ra-common", - "reqwest", + "reqwest 0.11.0", "serde", "serde_json", "structopt", @@ -4012,7 +4093,6 @@ dependencies = [ "http 0.2.1", "http-body 0.3.1", "hyper 0.13.5", - "hyper-rustls", "hyper-tls", "ipnet", "js-sys", @@ -4023,17 +4103,50 @@ dependencies = [ "native-tls", "percent-encoding", "pin-project-lite 0.2.0", - "rustls 0.18.1", "serde", "serde_json", "serde_urlencoded", "tokio 0.2.22", - "tokio-rustls", "tokio-tls", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", + "winreg", +] + +[[package]] +name = "reqwest" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd281b1030aa675fb90aa994d07187645bb3c8fc756ca766e7c3070b439de9de" +dependencies = [ + "base64 0.13.0", + "bytes 1.0.0", + "encoding_rs", + "futures-core", + "futures-util", + "http 0.2.1", + "http-body 0.4.0", + "hyper 0.14.2", + "hyper-rustls", + "ipnet", + "js-sys", + "lazy_static", + "log", + "mime", + "percent-encoding", + "pin-project-lite 0.2.0", + "rustls", + "serde", + "serde_json", + "serde_urlencoded", + "tokio 1.0.1", + "tokio-rustls", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", "webpki-roots", "winreg", ] @@ -4162,19 +4275,6 @@ dependencies = [ "nom", ] -[[package]] -name = "rustls" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81" -dependencies = [ - "base64 0.12.3", - "log", - "ring", - "sct", - "webpki", -] - [[package]] name = "rustls" version = "0.19.0" @@ -4586,13 +4686,12 @@ checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4" [[package]] name = "socket2" -version = "0.3.12" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" +checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", - "redox_syscall", "winapi 0.3.8", ] @@ -4747,7 +4846,7 @@ dependencies = [ "ra-client", "ra-enclave", "rs-libc", - "rustls 0.19.0", + "rustls", "serde_json", "sgx-isa", "tdbe-common", @@ -4916,7 +5015,7 @@ version = "0.1.0" dependencies = [ "enclave-macro", "ra-client", - "rustls 0.19.0", + "rustls", "webpki", ] @@ -5050,7 +5149,7 @@ checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" dependencies = [ "bytes 0.4.12", "futures 0.1.29", - "mio", + "mio 0.6.22", "num_cpus", "tokio-codec", "tokio-current-thread", @@ -5079,7 +5178,7 @@ dependencies = [ "lazy_static", "libc", "memchr", - "mio", + "mio 0.6.22", "mio-named-pipes", "mio-uds", "num_cpus", @@ -5090,6 +5189,21 @@ dependencies = [ "winapi 0.3.8", ] +[[package]] +name = "tokio" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d258221f566b6c803c7b4714abadc080172b272090cdc5e244a6d4dd13c3a6bd" +dependencies = [ + "autocfg 1.0.0", + "bytes 1.0.0", + "libc", + "memchr", + "mio 0.7.7", + "num_cpus", + "pin-project-lite 0.2.0", +] + [[package]] name = "tokio-buf" version = "0.1.1" @@ -5175,7 +5289,7 @@ dependencies = [ "futures 0.1.29", "lazy_static", "log", - "mio", + "mio 0.6.22", "num_cpus", "parking_lot 0.9.0", "slab", @@ -5186,16 +5300,26 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.14.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228139ddd4fea3fa345a29233009635235833e52807af7ea6448ead03890d6a9" +checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ - "futures-core", - "rustls 0.18.1", - "tokio 0.2.22", + "rustls", + "tokio 1.0.1", "webpki", ] +[[package]] +name = "tokio-stream" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4cdeb73537e63f98adcd73138af75e3f368ccaecffaa29d7eb61b9f5a440457" +dependencies = [ + "futures-core", + "pin-project-lite 0.2.0", + "tokio 1.0.1", +] + [[package]] name = "tokio-sync" version = "0.1.8" @@ -5215,7 +5339,7 @@ dependencies = [ "bytes 0.4.12", "futures 0.1.29", "iovec", - "mio", + "mio 0.6.22", "tokio-io", "tokio-reactor", ] @@ -5283,7 +5407,7 @@ dependencies = [ "bytes 0.4.12", "futures 0.1.29", "log", - "mio", + "mio 0.6.22", "tokio-codec", "tokio-io", "tokio-reactor", @@ -5300,7 +5424,7 @@ dependencies = [ "iovec", "libc", "log", - "mio", + "mio 0.6.22", "mio-uds", "tokio-codec", "tokio-io", @@ -5321,6 +5445,21 @@ dependencies = [ "tokio 0.2.22", ] +[[package]] +name = "tokio-util" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36135b7e7da911f5f8b9331209f7fab4cc13498f3fff52f72a710c78187e3148" +dependencies = [ + "bytes 1.0.0", + "futures-core", + "futures-sink", + "log", + "pin-project-lite 0.2.0", + "tokio 1.0.1", + "tokio-stream", +] + [[package]] name = "toml" version = "0.5.6" @@ -5336,6 +5475,36 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" +[[package]] +name = "tracing" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3" +dependencies = [ + "cfg-if 1.0.0", + "pin-project-lite 0.2.0", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "tracing-futures" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c" +dependencies = [ + "pin-project 0.4.26", + "tracing", +] + [[package]] name = "trait-async" version = "0.1.24" @@ -5393,7 +5562,7 @@ dependencies = [ "ra-enclave", "rand 0.7.3", "rs-libc", - "rustls 0.19.0", + "rustls", "secp256k1", "thread-pool", "zeroize", @@ -5699,9 +5868,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f" +checksum = "82015b7e0b8bad8185994674a13a93306bea76cf5a16c5a181382fd3a5ec2376" dependencies = [ "webpki", ] diff --git a/chain-tx-enclave-next/enclave-ra/ra-sp-server/Cargo.toml b/chain-tx-enclave-next/enclave-ra/ra-sp-server/Cargo.toml index 2cff3107e..a2b37c703 100644 --- a/chain-tx-enclave-next/enclave-ra/ra-sp-server/Cargo.toml +++ b/chain-tx-enclave-next/enclave-ra/ra-sp-server/Cargo.toml @@ -14,7 +14,7 @@ env_logger = "0.8" hex = "0.4" log = "0.4" percent-encoding = "2.1" -reqwest = { version = "0.10", default-features = false, features = ["blocking", "json", "rustls-tls"] } +reqwest = { version = "0.11", default-features = false, features = ["blocking", "json", "rustls-tls"] } serde_json = "1.0" structopt = "0.3" thiserror = "1.0"