build: bump rustls quinn version

Itsusinn · Apr 22, 2024 · 3115f52 · 3115f52
1 parent 82fab62
commit 3115f52
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 24 deletions.
diff --git a/tuic-client/Cargo.toml b/tuic-client/Cargo.toml
@@ -13,25 +13,37 @@ repository = "https://github.com/EAimTY/tuic"
 
 [dependencies]
 bytes = { version = "1", default-features = false, features = ["std"] }
-crossbeam-utils = { version = "0.8", default-features = false, features = ["std"] }
+
 env_logger = { version = "0.10", default-features = false, features = ["humantime"] }
 humantime = { version = "2", default-features = false }
 lexopt = { version = "0.3", default-features = false }
 log = { version = "0.4", default-features = false, features = ["serde", "std"] }
 once_cell = { version = "1", default-features = false, features = ["parking_lot", "std"] }
-quinn = { version = "0.10", default-features = false, features = ["futures-io", "runtime-tokio", "tls-rustls"] }
-register-count = { version = "0.1", default-features = false, features = ["std"] }
-rustls = { version = "0.21", default-features = false, features = ["quic"] }
-rustls-native-certs = { version = "0.6", default-features = false }
-rustls-pemfile = { version = "1", default-features = false }
+
 serde = { version = "1", default-features = false, features = ["derive", "std"] }
 serde_json = { version = "1", default-features = false, features = ["std"] }
 socket2 = { version = "0.5", default-features = false }
 socks5-proto = { version = "0.3", default-features = false }
 socks5-server = { version = "0.8", default-features = false }
 thiserror = { version = "1", default-features = false }
-tokio = { version = "1", default-features = false, features = ["io-util", "macros", "net", "parking_lot", "rt-multi-thread", "time"] }
-tokio-util = { version = "0.7", default-features = false, features = ["compat"] }
+
+
+uuid = { version = "1", default-features = false, features = ["serde", "std"] }
+
+# QUIC
+quinn = { branch = "main", git = "https://github.com/quinn-rs/quinn.git", default-features = false, features = ["runtime-tokio", "rustls", "platform-verifier", "log", "lock_tracking"] }
+
+# TUIC
 tuic = { path = "../tuic", default-features = false }
 tuic-quinn = { path = "../tuic-quinn", default-features = false }
-uuid = { version = "1", default-features = false, features = ["serde", "std"] }
+register-count = { version = "0.1.0", default-features = false, features = ["std"] }
+
+# Tokio/Async
+crossbeam-utils = { version = "0.8", default-features = false, features = ["std"] }
+tokio = { version = "1", default-features = false, features = ["io-util", "macros", "net", "parking_lot", "rt-multi-thread", "time"] }
+tokio-util = { version = "0.7", default-features = false, features = ["compat"] }
+
+# TLS
+rustls = { version = "0.23", default-features = false }
+rustls-native-certs = { version = "0.7", default-features = false }
+rustls-pemfile = { version = "2", default-features = false }
diff --git a/tuic-quinn/Cargo.toml b/tuic-quinn/Cargo.toml
@@ -14,7 +14,7 @@ repository = "https://github.com/EAimTY/tuic"
 [dependencies]
 bytes = { version = "1", default-features = false, features = ["std"] }
 futures-util = { version = "0.3", default-features = false, features = ["io", "std"] }
-quinn = { version = "0.10", default-features = false, features = ["futures-io"] }
+quinn = { branch = "main", git = "https://github.com/quinn-rs/quinn.git", default-features = false }
 thiserror = { version = "1", default-features = false }
 tuic = { path = "../tuic", default-features = false, features = ["async_marshal", "marshal", "model"] }
 uuid = { version = "1", default-features = false, features = ["std"] }
diff --git a/tuic-server/Cargo.toml b/tuic-server/Cargo.toml
@@ -12,22 +12,35 @@ license = "GPL-3.0-or-later"
 repository = "https://github.com/EAimTY/tuic"
 
 [dependencies]
-bytes = { version = "1", default-features = false, features = ["std"] }
-crossbeam-utils = { version = "0.8", default-features = false, features = ["std"] }
-env_logger = { version = "0.11", default-features = false, features = ["humantime"] }
-humantime = { version = "2", default-features = false }
+
 lexopt = { version = "0.3", default-features = false }
-log = { version = "0.4", default-features = false, features = ["serde", "std"] }
-quinn = { version = "0.10", default-features = false, features = ["futures-io", "runtime-tokio", "tls-rustls"] }
-register-count = { version = "0.1.0", default-features = false, features = ["std"] }
-rustls = { version = "0.21.1", default-features = false, features = ["quic"] }
-rustls-pemfile = { version = "1", default-features = false }
-serde = { version = "1", default-features = false, features = ["derive", "std"] }
-serde_json = { version = "1", default-features = false, features = ["std"] }
 socket2 = { version = "0.5", default-features = false }
 thiserror = { version = "1", default-features = false }
-tokio = { version = "1", default-features = false, features = ["io-util", "macros", "net", "parking_lot", "rt-multi-thread", "time"] }
-tokio-util = { version = "0.7", default-features = false, features = ["compat"] }
+uuid = { version = "1", default-features = false, features = ["serde", "std"] }
+
+# QUIC
+quinn = { branch = "main", git = "https://github.com/quinn-rs/quinn.git", default-features = false, features = ["runtime-tokio", "rustls", "platform-verifier", "log", "lock_tracking"] }
+
+# TUIC
 tuic = { path = "../tuic", default-features = false }
 tuic-quinn = { path = "../tuic-quinn", default-features = false }
-uuid = { version = "1", default-features = false, features = ["serde", "std"] }
+register-count = { version = "0.1.0", default-features = false, features = ["std"] }
+
+# Tokio/Async
+crossbeam-utils = { version = "0.8", default-features = false, features = ["std"] }
+tokio = { version = "1", default-features = false, features = ["io-util", "macros", "net", "parking_lot", "rt-multi-thread", "time"] }
+tokio-util = { version = "0.7", default-features = false, features = ["compat"] }
+
+# TLS
+rustls = { version = "0.23", default-features = false }
+rustls-pemfile = { version = "1", default-features = false }
+
+# Serde
+bytes = { version = "1", default-features = false, features = ["std"] }
+serde = { version = "1", default-features = false, features = ["derive", "std"] }
+serde_json = { version = "1", default-features = false, features = ["std"] }
+
+# Logging
+log = { version = "0.4", default-features = false, features = ["serde", "std"] }
+env_logger = { version = "0.11", default-features = false, features = ["humantime"] }
+humantime = { version = "2", default-features = false }