From d6c8907864267f5f63ffcf0a1664464d40bccaf3 Mon Sep 17 00:00:00 2001 From: sftcd Date: Fri, 18 Apr 2025 17:12:23 +0100 Subject: [PATCH] doh: httpsrr fix Closes #17099 --- lib/doh.c | 2 +- tests/ech_tests.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/doh.c b/lib/doh.c index 3f4747a155..b2406e5865 100644 --- a/lib/doh.c +++ b/lib/doh.c @@ -1295,7 +1295,7 @@ CURLcode Curl_doh_is_resolved(struct Curl_easy *data, if(dns) { /* Now add and HTTPSRR information if we have */ #ifdef USE_HTTPSRR - if(de.numhttps_rrs > 0 && result == CURLE_OK && *dnsp) { + if(de.numhttps_rrs > 0 && result == CURLE_OK) { struct Curl_https_rrinfo *hrr = NULL; result = doh_resp_decode_httpsrr(data, de.https_rrs->val, de.https_rrs->len, &hrr); diff --git a/tests/ech_tests.sh b/tests/ech_tests.sh index b83a82d644..a0512e0305 100755 --- a/tests/ech_tests.sh +++ b/tests/ech_tests.sh @@ -66,7 +66,7 @@ declare -A ech_targets=( [draft-13.esni.defo.ie:11413]="" [draft-13.esni.defo.ie:12413]="" [draft-13.esni.defo.ie:12414]="" - [crypto.cloudflare.com]="cdn-cgi/trace" + [cloudflare-ech.com]="cdn-cgi/trace" [tls-ech.dev]="" # this one's gone away for now (possibly temporarily) # [epochbelt.com]="" @@ -361,7 +361,7 @@ do then case $targ in "draft-13.esni.defo.ie:8414" | "tls-ech.dev" | \ - "crypto.cloudflare.com" | "epochbelt.com") + "cloudflare-ech.com" | "epochbelt.com") echo "Skipping $targ 'cause wolf"; continue;; *) ;; @@ -413,7 +413,7 @@ then echo "Skipping $targ as ports != 443 seem blocked" continue fi - if [[ "$host" == "crypto.cloudflare.com" ]] + if [[ "$host" == "cloudflare-ech.com" ]] then echo "Skipping $host as they've blocked PN override" continue -- 2.47.2