From d39cbcdecc7f0f42f8485d19f48297e47936c5e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 15:52:23 +0400 Subject: [PATCH] Bump tungstenite from 0.20.1 to 0.21.0 (#4479) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Bump tungstenite from 0.20.1 to 0.21.0 Bumps [tungstenite](https://github.com/snapview/tungstenite-rs) from 0.20.1 to 0.21.0. - [Changelog](https://github.com/snapview/tungstenite-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/snapview/tungstenite-rs/compare/v0.20.1...v0.21.0) --- updated-dependencies: - dependency-name: tungstenite dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * [chore]: bump http to 1.1.0 [chore]: bump attohttpc to 0.28.0 [chore]: bump tokio-tungstenite to 0.21.0 Signed-off-by: Nurzhan Sakén --------- Signed-off-by: dependabot[bot] Signed-off-by: Nurzhan Sakén Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nurzhan Sakén --- Cargo.lock | 163 +++++++++++++++++++++++++--------------------- Cargo.toml | 4 +- client/Cargo.toml | 4 +- 3 files changed, 91 insertions(+), 80 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 390dc7e58bd..4d197c7490a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -336,17 +336,17 @@ dependencies = [ [[package]] name = "attohttpc" -version = "0.26.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f77d243921b0979fbbd728dd2d5162e68ac8252976797c24eb5b3a6af9090dc" +checksum = "9a13149d0cf3f7f9b9261fad4ec63b2efbf9a80665f52def86282d26255e6331" dependencies = [ - "http 0.2.12", + "http 1.1.0", "log", "native-tls", - "rustls", + "rustls 0.22.4", "rustls-native-certs", "url", - "webpki-roots 0.25.3", + "webpki-roots 0.26.1", ] [[package]] @@ -438,6 +438,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + [[package]] name = "base64ct" version = "1.6.0" @@ -2396,7 +2402,7 @@ version = "7.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" dependencies = [ - "base64", + "base64 0.21.7", "byteorder", "flate2", "nom", @@ -2409,7 +2415,7 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64", + "base64 0.21.7", "bytes", "headers-core", "http 0.2.12", @@ -2738,7 +2744,7 @@ name = "iroha_client" version = "2.0.0-pre-rc.21" dependencies = [ "attohttpc", - "base64", + "base64 0.21.7", "color-eyre", "criterion", "derive_more", @@ -2746,7 +2752,7 @@ dependencies = [ "eyre", "futures-util", "hex", - "http 0.2.12", + "http 1.1.0", "iroha", "iroha_config", "iroha_crypto", @@ -2770,11 +2776,11 @@ dependencies = [ "test_network", "thiserror", "tokio", - "tokio-tungstenite 0.20.1", + "tokio-tungstenite", "toml 0.8.12", "tracing-flame", "tracing-subscriber", - "tungstenite 0.20.1", + "tungstenite", "url", ] @@ -2944,7 +2950,7 @@ dependencies = [ name = "iroha_data_model" version = "2.0.0-pre-rc.21" dependencies = [ - "base64", + "base64 0.21.7", "criterion", "derive_more", "displaydoc", @@ -3316,7 +3322,7 @@ dependencies = [ "streaming-stats", "tokio", "tokio-stream", - "tokio-tungstenite 0.20.1", + "tokio-tungstenite", "url", "vergen", ] @@ -4807,31 +4813,53 @@ checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", "ring", - "rustls-webpki", + "rustls-webpki 0.101.7", "sct", ] +[[package]] +name = "rustls" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.2", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" dependencies = [ "openssl-probe", "rustls-pemfile", + "rustls-pki-types", "schannel", "security-framework", ] [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64", + "base64 0.22.0", + "rustls-pki-types", ] +[[package]] +name = "rustls-pki-types" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -4842,6 +4870,17 @@ dependencies = [ "untrusted", ] +[[package]] +name = "rustls-webpki" +version = "0.102.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.14" @@ -5036,7 +5075,7 @@ version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" dependencies = [ - "base64", + "base64 0.21.7", "chrono", "hex", "indexmap 1.9.3", @@ -5671,11 +5710,12 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls", + "rustls 0.22.4", + "rustls-pki-types", "tokio", ] @@ -5693,32 +5733,21 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" dependencies = [ "futures-util", "log", "native-tls", - "rustls", + "rustls 0.22.4", "rustls-native-certs", + "rustls-pki-types", "tokio", "tokio-native-tls", "tokio-rustls", - "tungstenite 0.20.1", - "webpki-roots 0.25.3", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" -dependencies = [ - "futures-util", - "log", - "tokio", - "tungstenite 0.21.0", + "tungstenite", + "webpki-roots 0.26.1", ] [[package]] @@ -5798,7 +5827,7 @@ dependencies = [ "async-stream", "async-trait", "axum", - "base64", + "base64 0.21.7", "bytes", "h2", "http 0.2.12", @@ -5963,29 +5992,6 @@ dependencies = [ "toml 0.8.12", ] -[[package]] -name = "tungstenite" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http 0.2.12", - "httparse", - "log", - "native-tls", - "rand", - "rustls", - "rustls-native-certs", - "sha1", - "thiserror", - "url", - "utf-8", - "webpki-roots 0.24.0", -] - [[package]] name = "tungstenite" version = "0.21.0" @@ -5998,11 +6004,16 @@ dependencies = [ "http 1.1.0", "httparse", "log", + "native-tls", "rand", + "rustls 0.22.4", + "rustls-native-certs", + "rustls-pki-types", "sha1", "thiserror", "url", "utf-8", + "webpki-roots 0.26.1", ] [[package]] @@ -6114,11 +6125,11 @@ version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" dependencies = [ - "base64", + "base64 0.21.7", "log", "once_cell", - "rustls", - "rustls-webpki", + "rustls 0.21.10", + "rustls-webpki 0.101.7", "url", "webpki-roots 0.25.3", ] @@ -6270,7 +6281,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "tokio", - "tokio-tungstenite 0.21.0", + "tokio-tungstenite", "tokio-util", "tower-service", "tracing", @@ -6457,7 +6468,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aba5bf44d044d25892c03fb3534373936ee204141ff92bac8297787ac7f22318" dependencies = [ "anyhow", - "base64", + "base64 0.21.7", "bincode", "directories-next", "log", @@ -6731,18 +6742,18 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.24.0" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" -dependencies = [ - "rustls-webpki", -] +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" [[package]] name = "webpki-roots" -version = "0.25.3" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "winapi" diff --git a/Cargo.toml b/Cargo.toml index 27c9cc1b253..fb0628db62c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -64,8 +64,8 @@ drop_bomb = "0.1.5" futures = { version = "0.3.30", default-features = false } tokio = "1.37.0" tokio-stream = "0.1.15" -tokio-tungstenite = "0.20.1" -tungstenite = "0.20.1" +tokio-tungstenite = "0.21.0" +tungstenite = "0.21.0" crossbeam-queue = "0.3.11" parking_lot = { version = "0.12.1" } diff --git a/client/Cargo.toml b/client/Cargo.toml index d0cb86be9bc..cb1363174e2 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -57,9 +57,9 @@ iroha_telemetry = { workspace = true } iroha_torii_const = { workspace = true } iroha_version = { workspace = true, features = ["http"] } -attohttpc = { version = "0.26.1", default-features = false } +attohttpc = { version = "0.28.0", default-features = false } eyre = { workspace = true } -http = "0.2.12" +http = "1.1.0" url = { workspace = true } rand = { workspace = true } serde = { workspace = true, features = ["derive"] }