pierre/SeaBattle
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Rustls dependencies
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Pierre HUBERT
2024-01-17 19:08:38 +01:00
parent f727ed284f
commit a2e1407578
3 changed files with 101 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rust/sea_battle_cli_player/Cargo.toml
View File

@@ -24,11 +24,12 @@ 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.30"
serde_json = "1.0.110"
hostname = "0.3.1"
rustls = "0.21.9"
rustls = "0.22.0"
hyper-rustls = { version = "0.24.2", features = ["rustls-native-certs"] }
reqwest = { version = "0.11", features = ["json", "rustls-tls"], default-features = false }
reqwest = { version = "0.11", features = ["json", "rustls-tls"], default-features = false }
rustls-native-certs = {version = "0.7.0"}

9
rust/sea_battle_cli_player/src/client.rs
View File

@@ -2,7 +2,6 @@ use crate::cli_args::cli_args;
use crate::server;
use futures::stream::{SplitSink, SplitStream};
use futures::{SinkExt, StreamExt};
use hyper_rustls::ConfigBuilderExt;
use sea_battle_backend::data::*;
use sea_battle_backend::human_player_ws::{ClientMessage, ServerMessage};
use sea_battle_backend::server::{
@@ -127,9 +126,13 @@ impl Client {
let (socket, _) = if ws_url.starts_with("wss") {
// Perform a connection over TLS
let mut roots = rustls::RootCertStore::empty();
for cert in rustls_native_certs::load_native_certs()? {
roots.add(cert).unwrap();
}
let config = rustls::ClientConfig::builder()
.with_safe_defaults()
.with_native_roots()
.with_root_certificates(roots)
.with_no_client_auth();
let connector = tokio_tungstenite::Connector::Rustls(Arc::new(config));