1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
|
Index: sqlx-core/Cargo.toml
===================================================================
--- sqlx-core.orig/Cargo.toml
+++ sqlx-core/Cargo.toml
@@ -147,6 +147,10 @@ default-features = false
version = "0.8.0"
optional = true
+[dependencies.rustls-webpki]
+version = "0.101.7"
+optional = true
+
[dependencies.rustls-pemfile]
version = "2"
optional = true
@@ -213,10 +217,6 @@ version = "2.2.2"
version = "1.1.2"
optional = true
-[dependencies.webpki-roots]
-version = "0.26"
-optional = true
-
[dev-dependencies.sqlx]
version = "=0.8.3"
features = [
@@ -252,18 +252,14 @@ _tls-rustls = [
_tls-rustls-aws-lc-rs = [
"_tls-rustls",
"rustls/aws-lc-rs",
- "webpki-roots",
+ "rustls-native-certs",
+ "dep:rustls-webpki",
]
_tls-rustls-ring-native-roots = [
"_tls-rustls",
"rustls/ring",
"rustls-native-certs",
]
-_tls-rustls-ring-webpki = [
- "_tls-rustls",
- "rustls/ring",
- "webpki-roots",
-]
any = []
default = []
json = [
Index: sqlx-core/src/net/tls/tls_rustls.rs
===================================================================
--- sqlx-core.orig/src/net/tls/tls_rustls.rs
+++ sqlx-core/src/net/tls/tls_rustls.rs
@@ -134,9 +134,9 @@ where
.with_no_client_auth()
}
} else {
- #[cfg(any(feature = "_tls-rustls-aws-lc-rs", feature = "_tls-rustls-ring-webpki"))]
- let mut cert_store = certs_from_webpki();
- #[cfg(feature = "_tls-rustls-ring-native-roots")]
+ //#[cfg(any(feature = "_tls-rustls-aws-lc-rs", feature = "_tls-rustls-ring-webpki"))]
+ //let mut cert_store = certs_from_webpki();
+ //#[cfg(feature = "_tls-rustls-ring-native-roots")]
let mut cert_store = certs_from_native_store();
if let Some(ca) = tls_config.root_cert_path {
@@ -213,12 +213,12 @@ fn private_key_from_pem(pem: Vec<u8>) ->
}
}
-#[cfg(any(feature = "_tls-rustls-aws-lc-rs", feature = "_tls-rustls-ring-webpki"))]
+/*#[cfg(any(feature = "_tls-rustls-aws-lc-rs", feature = "_tls-rustls-ring-webpki"))]
fn certs_from_webpki() -> RootCertStore {
RootCertStore::from_iter(webpki_roots::TLS_SERVER_ROOTS.iter().cloned())
-}
+}*/
-#[cfg(feature = "_tls-rustls-ring-native-roots")]
+//#[cfg(feature = "_tls-rustls-ring-native-roots")]
fn certs_from_native_store() -> RootCertStore {
let mut root_cert_store = RootCertStore::empty();
|
