diff --git a/Cargo.lock b/Cargo.lock index 40242e2d..7818f8f0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1291,7 +1291,7 @@ dependencies = [ "serde_derive", "serde_json", "thiserror", - "tokio", + "tokio 0.2.25", "tokio-rustls 0.13.1", "url", ] @@ -1565,7 +1565,7 @@ dependencies = [ "serde_json", "term 0.6.1", "thiserror", - "tokio", + "tokio 1.18.5", "url", "uuid", ] @@ -1603,7 +1603,7 @@ dependencies = [ "sysinfo", "thiserror", "timer", - "tokio", + "tokio 1.18.5", "url", "uuid", "x25519-dalek 0.6.0", @@ -1674,7 +1674,7 @@ dependencies = [ "http", "indexmap", "slab", - "tokio", + "tokio 0.2.25", "tokio-util", "tracing", "tracing-futures", @@ -1804,8 +1804,8 @@ dependencies = [ "httpdate", "itoa 0.4.8", "pin-project", - "socket2", - "tokio", + "socket2 0.3.19", + "tokio 0.2.25", "tower-service", "tracing", "want", @@ -1824,7 +1824,7 @@ dependencies = [ "log", "rustls 0.17.0", "rustls-native-certs", - "tokio", + "tokio 0.2.25", "tokio-rustls 0.13.1", "webpki", ] @@ -1840,7 +1840,7 @@ dependencies = [ "hyper", "log", "rustls 0.18.1", - "tokio", + "tokio 0.2.25", "tokio-rustls 0.14.1", "webpki", ] @@ -1853,7 +1853,7 @@ checksum = "0d1f9b0b8258e3ef8f45928021d3ef14096c2b93b99e4b8cfcabf1f58ec84b0a" dependencies = [ "bytes 0.5.6", "hyper", - "tokio", + "tokio 0.2.25", "tokio-io-timeout", ] @@ -1866,7 +1866,7 @@ dependencies = [ "bytes 0.5.6", "hyper", "native-tls", - "tokio", + "tokio 0.2.25", "tokio-tls", ] @@ -2331,6 +2331,18 @@ dependencies = [ "winapi 0.2.8", ] +[[package]] +name = "mio" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +dependencies = [ + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.45.0", +] + [[package]] name = "mio-named-pipes" version = "0.1.7" @@ -2338,7 +2350,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" dependencies = [ "log", - "mio", + "mio 0.6.23", "miow 0.3.7", "winapi 0.3.9", ] @@ -2351,7 +2363,7 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" dependencies = [ "iovec", "libc", - "mio", + "mio 0.6.23", ] [[package]] @@ -3304,7 +3316,7 @@ dependencies = [ "rustls 0.18.1", "serde", "serde_urlencoded", - "tokio", + "tokio 0.2.25", "tokio-rustls 0.14.1", "tokio-socks", "tokio-tls", @@ -3832,6 +3844,16 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi 0.3.9", +] + [[package]] name = "spin" version = "0.5.2" @@ -4080,14 +4102,33 @@ dependencies = [ "lazy_static", "libc", "memchr", - "mio", + "mio 0.6.23", "mio-named-pipes", "mio-uds", "num_cpus", "pin-project-lite 0.1.12", "signal-hook-registry", "slab", - "tokio-macros", + "tokio-macros 0.2.6", + "winapi 0.3.9", +] + +[[package]] +name = "tokio" +version = "1.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e050c618355082ae5a89ec63bbf897225d5ffe84c7c4e036874e4d185a5044e" +dependencies = [ + "bytes 1.2.0", + "libc", + "memchr", + "mio 0.8.6", + "num_cpus", + "parking_lot 0.12.1", + "pin-project-lite 0.2.9", + "signal-hook-registry", + "socket2 0.4.9", + "tokio-macros 1.8.2", "winapi 0.3.9", ] @@ -4098,7 +4139,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9390a43272c8a6ac912ed1d1e2b6abeafd5047e05530a2fa304deee041a06215" dependencies = [ "bytes 0.5.6", - "tokio", + "tokio 0.2.25", ] [[package]] @@ -4112,6 +4153,17 @@ dependencies = [ "syn 1.0.98", ] +[[package]] +name = "tokio-macros" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +dependencies = [ + "proc-macro2 1.0.42", + "quote 1.0.20", + "syn 1.0.98", +] + [[package]] name = "tokio-rustls" version = "0.13.1" @@ -4120,7 +4172,7 @@ checksum = "15cb62a0d2770787abc96e99c1cd98fcf17f94959f3af63ca85bdfb203f051b4" dependencies = [ "futures-core", "rustls 0.17.0", - "tokio", + "tokio 0.2.25", "webpki", ] @@ -4132,7 +4184,7 @@ checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a" dependencies = [ "futures-core", "rustls 0.18.1", - "tokio", + "tokio 0.2.25", "webpki", ] @@ -4146,7 +4198,7 @@ dependencies = [ "either", "futures 0.3.21", "thiserror", - "tokio", + "tokio 0.2.25", ] [[package]] @@ -4156,7 +4208,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" dependencies = [ "native-tls", - "tokio", + "tokio 0.2.25", ] [[package]] @@ -4170,7 +4222,7 @@ dependencies = [ "futures-sink", "log", "pin-project-lite 0.1.12", - "tokio", + "tokio 0.2.25", ] [[package]] diff --git a/controller/Cargo.toml b/controller/Cargo.toml index bd4122d7..72ffc3b3 100644 --- a/controller/Cargo.toml +++ b/controller/Cargo.toml @@ -21,7 +21,7 @@ log = "0.4" prettytable-rs = "0.10" ring = "0.16" term = "0.6" -tokio = { version = "0.2", features = ["full"] } +tokio = { version = "1.18", features = ["full"] } uuid = { version = "0.8", features = ["serde", "v4"] } url = "2.1" chrono = { version = "0.4.11", features = ["serde"] } diff --git a/impls/Cargo.toml b/impls/Cargo.toml index 44bba107..265bed9f 100644 --- a/impls/Cargo.toml +++ b/impls/Cargo.toml @@ -22,7 +22,7 @@ ring = "0.16" uuid = { version = "0.8", features = ["serde", "v4"] } chrono = { version = "0.4.11", features = ["serde"] } lazy_static = "1" -tokio = { version = "0.2", features = ["full"] } +tokio = { version = "1.18", features = ["full"] } reqwest = { version = "0.10", features = ["rustls-tls", "socks"] } #Socks/Tor/Bridge/Proxy