Update Rust crate tokio-tungstenite to 0.21.0

2023-12-08 00:16:30 +00:00 · 2023-12-08 00:16:30 +00:00 · 6de9e134d8
commit 6de9e134d8
parent 78606dbe74
3 changed files with 118 additions and 28 deletions
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@ -80,7 +80,7 @@ dependencies = [
 "flate2",
 "futures-core",
 "h2",
- "http",
+ "http 0.2.9",
 "httparse",
 "httpdate",
 "itoa",
@ -115,7 +115,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d66ff4d247d2b160861fa2866457e85706833527840e4133f8f49aa423a38799"
 dependencies = [
 "bytestring",
- "http",
+ "http 0.2.9",
 "regex",
 "serde",
 "tracing",
@ -933,7 +933,7 @@ dependencies = [
 "futures-core",
 "futures-sink",
 "futures-util",
- "http",
+ "http 0.2.9",
 "indexmap 1.9.3",
 "slab",
 "tokio",
@ -1005,6 +1005,17 @@ dependencies = [
 "itoa",
 ]

+[[package]]
+name = "http"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
 [[package]]
 name = "http-body"
 version = "0.4.5"
@ -1012,7 +1023,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
 dependencies = [
 "bytes",
- "http",
+ "http 0.2.9",
 "pin-project-lite",
 ]

@ -1045,7 +1056,7 @@ dependencies = [
 "futures-core",
 "futures-util",
 "h2",
- "http",
+ "http 0.2.9",
 "http-body",
 "httparse",
 "httpdate",
@ -1065,13 +1076,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
 dependencies = [
 "futures-util",
- "http",
+ "http 0.2.9",
 "hyper",
 "log",
- "rustls",
- "rustls-native-certs",
+ "rustls 0.21.9",
+ "rustls-native-certs 0.6.2",
 "tokio",
- "tokio-rustls",
+ "tokio-rustls 0.24.1",
 ]

 [[package]]
@ -1548,7 +1559,7 @@ dependencies = [
 "futures-core",
 "futures-util",
 "h2",
- "http",
+ "http 0.2.9",
 "http-body",
 "hyper",
 "hyper-rustls",
@ -1559,13 +1570,13 @@ dependencies = [
 "once_cell",
 "percent-encoding",
 "pin-project-lite",
- "rustls",
- "rustls-pemfile",
+ "rustls 0.21.9",
+ "rustls-pemfile 1.0.2",
 "serde",
 "serde_json",
 "serde_urlencoded",
 "tokio",
- "tokio-rustls",
+ "tokio-rustls 0.24.1",
 "tower-service",
 "url",
 "wasm-bindgen",
@ -1641,10 +1652,24 @@ checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9"
 dependencies = [
 "log",
 "ring 0.17.3",
- "rustls-webpki",
+ "rustls-webpki 0.101.7",
 "sct",
 ]

+[[package]]
+name = "rustls"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bc238b76c51bbc449c55ffbc39d03772a057cc8cf783c49d4af4c2537b74a8b"
+dependencies = [
+ "log",
+ "ring 0.17.3",
+ "rustls-pki-types",
+ "rustls-webpki 0.102.0",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "rustls-native-certs"
 version = "0.6.2"
@ -1652,7 +1677,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50"
 dependencies = [
 "openssl-probe",
- "rustls-pemfile",
+ "rustls-pemfile 1.0.2",
+ "schannel",
+ "security-framework",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792"
+dependencies = [
+ "openssl-probe",
+ "rustls-pemfile 2.0.0",
+ "rustls-pki-types",
 "schannel",
 "security-framework",
 ]
@ -1666,6 +1704,22 @@ dependencies = [
 "base64",
 ]

+[[package]]
+name = "rustls-pemfile"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35e4980fa29e4c4b212ffb3db068a564cbf560e51d3944b7c88bd8bf5bec64f4"
+dependencies = [
+ "base64",
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7673e0aa20ee4937c6aacfc12bb8341cfbf054cdd21df6bec5fd0629fe9339b"
+
 [[package]]
 name = "rustls-webpki"
 version = "0.101.7"
@ -1676,6 +1730,17 @@ dependencies = [
 "untrusted 0.9.0",
 ]

+[[package]]
+name = "rustls-webpki"
+version = "0.102.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de2635c8bc2b88d367767c5de8ea1d8db9af3f6219eba28442242d9ab81d1b89"
+dependencies = [
+ "ring 0.17.3",
+ "rustls-pki-types",
+ "untrusted 0.9.0",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.13"
@ -1747,7 +1812,7 @@ dependencies = [
 "num-derive",
 "num-traits",
 "reqwest",
- "rustls",
+ "rustls 0.21.9",
 "sea_battle_backend",
 "serde_json",
 "serde_urlencoded",
@ -1958,6 +2023,12 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"

+[[package]]
+name = "subtle"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+
 [[package]]
 name = "syn"
 version = "1.0.109"
@ -2098,22 +2169,34 @@ version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
 dependencies = [
- "rustls",
+ "rustls 0.21.9",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
+dependencies = [
+ "rustls 0.22.0",
+ "rustls-pki-types",
 "tokio",
 ]

 [[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",
- "rustls",
- "rustls-native-certs",
+ "rustls 0.22.0",
+ "rustls-native-certs 0.7.0",
+ "rustls-pki-types",
 "tokio",
- "tokio-rustls",
+ "tokio-rustls 0.25.0",
 "tungstenite",
 ]

@ -2179,18 +2262,19 @@ dependencies = [

 [[package]]
 name = "tungstenite"
-version = "0.20.1"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9"
+checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1"
 dependencies = [
 "byteorder",
 "bytes",
 "data-encoding",
- "http",
+ "http 1.0.0",
 "httparse",
 "log",
 "rand",
- "rustls",
+ "rustls 0.22.0",
+ "rustls-pki-types",
 "sha1",
 "thiserror",
 "url",
@ -2603,6 +2687,12 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "zeroize"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+
 [[package]]
 name = "zstd"
 version = "0.12.3+zstd.1.5.2"
--- a/rust/sea_battle_backend/Cargo.toml
+++ b/rust/sea_battle_backend/Cargo.toml
@ -30,6 +30,6 @@ semver = "1.0.20"

 [dev-dependencies]
 #reqwest = { version = "0.11.11", default-features = false, features = ["json", "rustls-tls"] }
-tokio-tungstenite = "0.20.1"
+tokio-tungstenite = "0.21.0"
 serde_urlencoded = "0.7.1"
 futures = "0.3.29"
--- a/rust/sea_battle_cli_player/Cargo.toml
+++ b/rust/sea_battle_cli_player/Cargo.toml
@ -24,7 +24,7 @@ num = "0.4.1"
 num-traits = "0.2.17"
 num-derive = "0.4.1"
 textwrap = "0.16.0"
-tokio-tungstenite = { version = "0.20.1", features = ["__rustls-tls", "rustls-tls-native-roots"] }
+tokio-tungstenite = { version = "0.21.0", features = ["__rustls-tls", "rustls-tls-native-roots"] }
 serde_urlencoded = "0.7.1"
 futures = "0.3.29"
 serde_json = "1.0.105"