From 689443bf426d3601e3facdbf1c1ee8a027775755 Mon Sep 17 00:00:00 2001 From: Jay Satiro Date: Thu, 5 Dec 2019 19:17:31 -0500 Subject: lib: fix some loose ends for recently added CURLSSLOPT_NO_PARTIALCHAIN Add support for CURLSSLOPT_NO_PARTIALCHAIN in CURLOPT_PROXY_SSL_OPTIONS and OS400 package spec. Also I added the option to the NameValue list in the tool even though it isn't exposed as a command-line option (...yet?). (NameValue stringizes the option name for the curl cmd -> libcurl source generator) Follow-up to 564d88a which added CURLSSLOPT_NO_PARTIALCHAIN. Ref: https://github.com/curl/curl/pull/4655 --- lib/setopt.c | 1 + packages/OS400/curl.inc.in | 2 ++ src/tool_setopt.c | 1 + 3 files changed, 4 insertions(+) diff --git a/lib/setopt.c b/lib/setopt.c index 57e1090ce..5f88ad3af 100644 --- a/lib/setopt.c +++ b/lib/setopt.c @@ -2142,6 +2142,7 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param) data->set.proxy_ssl.enable_beast = (bool)((arg&CURLSSLOPT_ALLOW_BEAST) ? TRUE : FALSE); data->set.proxy_ssl.no_revoke = !!(arg & CURLSSLOPT_NO_REVOKE); + data->set.proxy_ssl.no_partialchain = !!(arg & CURLSSLOPT_NO_PARTIALCHAIN); break; #endif diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in index 9a44eae49..3f32b358d 100644 --- a/packages/OS400/curl.inc.in +++ b/packages/OS400/curl.inc.in @@ -760,6 +760,8 @@ d c X'0001' d CURLSSLOPT_NO_REVOKE... d c X'0002' + d CURLSSLOPT_NO_PARTIALCHAIN... + d c X'0004' * d CURL_HET_DEFAULT... d c 200 diff --git a/src/tool_setopt.c b/src/tool_setopt.c index e56af1317..9b308bf4a 100644 --- a/src/tool_setopt.c +++ b/src/tool_setopt.c @@ -124,6 +124,7 @@ const NameValue setopt_nv_CURLUSESSL[] = { const NameValueUnsigned setopt_nv_CURLSSLOPT[] = { NV(CURLSSLOPT_ALLOW_BEAST), NV(CURLSSLOPT_NO_REVOKE), + NV(CURLSSLOPT_NO_PARTIALCHAIN), NVEND, }; -- cgit v1.2.3