From ddce68df3d489c7b6dcd6cc48f2c09d9a93dfb9a Mon Sep 17 00:00:00 2001 From: Jacherr Date: Sun, 20 Oct 2024 14:54:24 +0100 Subject: [PATCH] manually set cryptoprovider --- Cargo.toml | 4 +++- assyst-core/Cargo.toml | 2 ++ assyst-core/src/main.rs | 2 ++ assyst-gateway/Cargo.toml | 2 ++ assyst-gateway/src/main.rs | 2 ++ 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 0ec9b7f..5c07bb2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,9 @@ serde = { version = "1.0.123", features = ["derive"] } tokio = { version = "1.34.0", features = ["full"] } tracing = "0.1.37" twilight-gateway = { git = "https://github.com/twilight-rs/twilight", branch = "erk/user-apps" } -twilight-http = { git = "https://github.com/twilight-rs/twilight", branch = "erk/user-apps" } +twilight-http = { git = "https://github.com/twilight-rs/twilight", branch = "erk/user-apps", features = [ + "rustls-ring", +] } twilight-model = { git = "https://github.com/twilight-rs/twilight", branch = "erk/user-apps" } twilight-util = { git = "https://github.com/twilight-rs/twilight", branch = "erk/user-apps", features = [ "builder", diff --git a/assyst-core/Cargo.toml b/assyst-core/Cargo.toml index e4ac985..ec8179d 100644 --- a/assyst-core/Cargo.toml +++ b/assyst-core/Cargo.toml @@ -15,6 +15,7 @@ assyst-string-fmt = { path = "../assyst-string-fmt" } assyst-tag = { path = "../assyst-tag" } assyst-webserver = { path = "../assyst-webserver" } async-trait = "0.1.77" +aws-lc-rs = "1.10.0" bincode = "1.3.3" bytes = "1.5.0" dash_rt = { git = "https://github.com/y21/dash", rev = "f3fe12b" } @@ -31,6 +32,7 @@ paste = "1.0.14" prometheus = "0.13.3" rand = "0.8.5" reqwest = { version = "0.11.24", features = ["json", "stream", "multipart"] } +rustls = "0.23.15" serde = { workspace = true } serde_json = "1.0.113" time = { version = "0.3.31", features = ["macros"] } diff --git a/assyst-core/src/main.rs b/assyst-core/src/main.rs index ec6d72b..78d1657 100644 --- a/assyst-core/src/main.rs +++ b/assyst-core/src/main.rs @@ -61,6 +61,8 @@ async fn main() { panic!("Assyst is supported on Linux only.") } + rustls::crypto::aws_lc_rs::default_provider().install_default().unwrap(); + tracing_init(); let assyst: ThreadSafeAssyst = Arc::new(Assyst::new().await.unwrap()); diff --git a/assyst-gateway/Cargo.toml b/assyst-gateway/Cargo.toml index 846e021..62f8b77 100644 --- a/assyst-gateway/Cargo.toml +++ b/assyst-gateway/Cargo.toml @@ -19,6 +19,8 @@ time = { version = "0.3.31", features = ["macros"] } twilight-model = { workspace = true } twilight-http = { workspace = true } jemallocator = "0.5.4" +aws-lc-rs = "1.10.0" +rustls = "0.23.15" [lints] workspace = true diff --git a/assyst-gateway/src/main.rs b/assyst-gateway/src/main.rs index bbf721d..d0100f9 100644 --- a/assyst-gateway/src/main.rs +++ b/assyst-gateway/src/main.rs @@ -46,6 +46,8 @@ async fn main() -> anyhow::Result<()> { panic!("Assyst is supported on Linux only.") } + rustls::crypto::aws_lc_rs::default_provider().install_default().unwrap(); + tracing_init(); let http_client = HttpClient::new(CONFIG.authentication.discord_token.clone());