summaryrefslogtreecommitdiff
path: root/src/tool_help.c
diff options
context:
space:
mode:
authorJay Satiro <raysatiro@yahoo.com>2021-02-11 17:09:59 -0500
committerJay Satiro <raysatiro@yahoo.com>2021-02-14 18:20:48 -0500
commit53022e1893de74b73554396b697f5a06cc7bc3f2 (patch)
treec771a0d256d150a43481f1b48b13656a6d9f4b93 /src/tool_help.c
parentb68026f7f4f4f99926fabf7f7b8ec948d5fcdc72 (diff)
downloadcurl-53022e1893de74b73554396b697f5a06cc7bc3f2.tar.gz
doh: add options to disable ssl verification
- New libcurl options CURLOPT_DOH_SSL_VERIFYHOST, CURLOPT_DOH_SSL_VERIFYPEER and CURLOPT_DOH_SSL_VERIFYSTATUS do the same as their respective counterparts. - New curl tool options --doh-insecure and --doh-cert-status do the same as their respective counterparts. Prior to this change DOH SSL certificate verification settings for verifyhost and verifypeer were supposed to be inherited respectively from CURLOPT_SSL_VERIFYHOST and CURLOPT_SSL_VERIFYPEER, but due to a bug were not. As a result DOH verification remained at the default, ie enabled, and it was not possible to disable. This commit changes behavior so that the DOH verification settings are independent and not inherited. Ref: https://github.com/curl/curl/pull/4579#issuecomment-554723676 Fixes https://github.com/curl/curl/issues/4578 Closes https://github.com/curl/curl/pull/6597
Diffstat (limited to 'src/tool_help.c')
-rw-r--r--src/tool_help.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/tool_help.c b/src/tool_help.c
index 104ab98c2..f3046b7df 100644
--- a/src/tool_help.c
+++ b/src/tool_help.c
@@ -149,7 +149,7 @@ static const struct helptxt helptext[] = {
"Client certificate file and password",
CURLHELP_TLS},
{" --cert-status",
- "Verify the status of the server certificate",
+ "Verify the status of the server cert via OCSP-staple",
CURLHELP_TLS},
{" --cert-type <type>",
"Certificate type (DER/PEM/ENG)",
@@ -241,6 +241,12 @@ static const struct helptxt helptext[] = {
{" --dns-servers <addresses>",
"DNS server addrs to use",
CURLHELP_DNS},
+ {" --doh-cert-status",
+ "Verify the status of the DOH server cert via OCSP-staple",
+ CURLHELP_DNS | CURLHELP_TLS},
+ {" --doh-insecure",
+ "Allow insecure DOH server connections",
+ CURLHELP_DNS | CURLHELP_TLS},
{" --doh-url <URL>",
"Resolve host names over DOH",
CURLHELP_DNS},