Skip to content

Commit efe384b

Browse files
committed
Merge branch 'fix-audit-65'
2 parents 56a0250 + 9ccc90c commit efe384b

File tree

9 files changed

+549
-178
lines changed

9 files changed

+549
-178
lines changed

Cargo.lock

Lines changed: 140 additions & 98 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/phactory/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ async-trait = "0.1.57"
6868
phala-scheduler = { path = "../phala-scheduler" }
6969
sgx-api-lite = { path = "../sgx-api-lite" }
7070
sgx-attestation = { path = "../sgx-attestation" }
71-
reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "socks", "trust-dns"] }
71+
reqwest = { version = "0.11.27", default-features = false, features = ["rustls-tls", "socks", "hickory-dns"] }
7272
reqwest-env-proxy = { path = "../reqwest-env-proxy" }
7373
libc = "0.2"
7474

crates/phactory/src/prpc_service.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2085,7 +2085,7 @@ impl<Platform: pal::Platform + Serialize + DeserializeOwned> PhactoryApi for Rpc
20852085
let url: reqwest::Url = request.url.parse().map_err(from_debug)?;
20862086

20872087
let client = reqwest::Client::builder()
2088-
.trust_dns(true)
2088+
.hickory_dns(true)
20892089
.env_proxy(url.host_str().unwrap_or_default())
20902090
.build()
20912091
.map_err(from_debug)?;

crates/pink/chain-extension/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ edition = "2021"
1010
pink = { version = "0.4.1", path = "../pink" }
1111
reqwest-env-proxy = { version = "0.1", path = "../../reqwest-env-proxy" }
1212
sp-core = { version = "21", features = ["full_crypto"] }
13-
reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "socks", "trust-dns"] }
13+
reqwest = { version = "0.11.27", default-features = false, features = ["rustls-tls", "socks", "hickory-dns"] }
1414
log = "0.4"
1515
getrandom = "0.2"
1616
once_cell = "1.10.0"

crates/pink/chain-extension/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ async fn async_http_request(
107107
let timeout = Duration::from_millis(timeout_ms);
108108
let url: reqwest::Url = request.url.parse().or(Err(HttpRequestError::InvalidUrl))?;
109109
let client = reqwest::Client::builder()
110-
.trust_dns(true)
110+
.hickory_dns(true)
111111
.timeout(timeout)
112112
.env_proxy(url.host_str().unwrap_or_default())
113113
.build()

crates/sgx-attestation/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ anyhow = { version = "1", optional = true }
3333
ring = { version = "0.16.20", optional = true, default-features = false, features = [
3434
"alloc",
3535
] }
36-
reqwest = { version = "0.11", optional = true, default-features = false, features = [
36+
reqwest = { version = "0.11.27", optional = true, default-features = false, features = [
3737
"rustls-tls",
3838
"blocking",
39-
"trust-dns",
39+
"hickory-dns",
4040
] }
4141
urlencoding = { version = "2", optional = true }
4242
serde_json = { version = "1.0.108", optional = true, features = [

crates/sgx-attestation/src/ias/report.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ fn get_report_from_intel(quote: &[u8], timeout: Duration) -> Result<(String, Str
2121
let url: reqwest::Url = format!("https://{IAS_HOST}{IAS_REPORT_ENDPOINT}").parse()?;
2222
info!(from=%url, "Getting RA report");
2323
let mut res = reqwest::blocking::Client::builder()
24-
.trust_dns(true)
24+
.hickory_dns(true)
2525
.timeout(Some(timeout))
2626
.env_proxy(url.domain().unwrap_or_default())
2727
.build()

0 commit comments

Comments
 (0)