matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-07-31 09:24:31 +03:00
Code Activity

Fix the default features set

Browse Source
This commit is contained in:
Quentin Gliech
2022-11-03 14:43:07 +01:00
parent 041eb7013c
commit 9756f3c704
4 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/axum-utils/Cargo.toml
View File

@ -39,6 +39,5 @@ mas-storage = { path = "../storage" }
mas-templates = { path = "../templates" } mas-templates = { path = "../templates" }
[features] [features]
default = ["native-roots"]
native-roots = ["mas-http/native-roots"] native-roots = ["mas-http/native-roots"]
webpki-roots = ["mas-http/webpki-roots"] webpki-roots = ["mas-http/webpki-roots"]

2
crates/handlers/Cargo.toml
View File

@ -65,8 +65,6 @@ mas-templates = { path = "../templates" }
indoc = "1.0.7" indoc = "1.0.7"
[features] [features]
default = ["native-roots"]
# Use the native root certificates # Use the native root certificates
native-roots = ["mas-axum-utils/native-roots", "mas-http/native-roots"] native-roots = ["mas-axum-utils/native-roots", "mas-http/native-roots"]
# Use the webpki root certificates # Use the webpki root certificates

1
crates/http/Cargo.toml
View File

@ -39,7 +39,6 @@ tokio = { version = "1.21.2", features = ["macros", "rt"] }
tower = { version = "0.4.13", features = ["util"] } tower = { version = "0.4.13", features = ["util"] }
[features] [features]
default = []
axum = ["dep:axum"] axum = ["dep:axum"]
native-roots = ["dep:rustls-native-certs"] native-roots = ["dep:rustls-native-certs"]
webpki-roots = ["dep:webpki-roots"] webpki-roots = ["dep:webpki-roots"]

1
crates/http/src/client.rs
View File

@ -84,6 +84,7 @@ async fn tls_roots() -> Result<rustls::RootCertStore, NativeRootsInitError> {
} }
#[cfg(feature = "webpki-roots")] #[cfg(feature = "webpki-roots")]
#[allow(clippy::unused_async)]
async fn tls_roots() -> Result<rustls::RootCertStore, Infallible> { async fn tls_roots() -> Result<rustls::RootCertStore, Infallible> {
let mut roots = rustls::RootCertStore::empty(); let mut roots = rustls::RootCertStore::empty();
roots.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.0.iter().map(|ta| { roots.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.0.iter().map(|ta| {