From d20b0dc81dd9f5c33f96ca0d3b8a3ef1a839c28a Mon Sep 17 00:00:00 2001
From: Quentin Gliech <quenting@element.io>
Date: Fri, 2 Feb 2024 14:06:17 +0100
Subject: [PATCH] Fix the native-certs (and therefore docker) build

---
 crates/cli/Cargo.toml      | 4 ++--
 crates/handlers/Cargo.toml | 6 ++----
 crates/http/src/client.rs  | 3 +--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
index d3dd3069..af9b5713 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -56,8 +56,8 @@ mas-config.workspace = true
 mas-data-model.workspace = true
 mas-email.workspace = true
 mas-graphql.workspace = true
-mas-handlers = { workspace = true, default-features = false }
-mas-http = { workspace = true, default-features = false, features = ["axum", "client"] }
+mas-handlers = { workspace = true }
+mas-http = { workspace = true, features = ["axum", "client"] }
 mas-i18n.workspace = true
 mas-iana.workspace = true
 mas-keystore.workspace = true
diff --git a/crates/handlers/Cargo.toml b/crates/handlers/Cargo.toml
index f66c91b6..f837416c 100644
--- a/crates/handlers/Cargo.toml
+++ b/crates/handlers/Cargo.toml
@@ -68,10 +68,10 @@ rand_chacha = "0.3.1"
 headers = "0.3.9"
 ulid.workspace = true
 
-mas-axum-utils = { workspace = true, default-features = false }
+mas-axum-utils.workspace = true
 mas-data-model.workspace = true
 mas-graphql.workspace = true
-mas-http = { workspace = true, default-features = false }
+mas-http.workspace = true
 mas-i18n.workspace = true
 mas-iana.workspace = true
 mas-jose.workspace = true
@@ -92,8 +92,6 @@ tracing-subscriber.workspace = true
 cookie_store = "0.20.0"
 
 [features]
-default = ["webpki-roots"]
-
 # Use the native root certificates
 native-roots = ["mas-axum-utils/native-roots", "mas-http/native-roots"]
 # Use the webpki root certificates
diff --git a/crates/http/src/client.rs b/crates/http/src/client.rs
index 9719e792..265d4328 100644
--- a/crates/http/src/client.rs
+++ b/crates/http/src/client.rs
@@ -43,8 +43,7 @@ fn load_tls_roots_blocking() -> Result<rustls::RootCertStore, NativeRootsLoadErr
     let mut roots = rustls::RootCertStore::empty();
     let certs = rustls_native_certs::load_native_certs()?;
     for cert in certs {
-        let cert = rustls::Certificate(cert.0);
-        roots.add(&cert)?;
+        roots.add(cert)?;
     }
 
     if roots.is_empty() {