moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-02-28 09:21:50 -05:00
Code Issues Releases Wiki Activity

lib: fix some loose ends for recently added CURLSSLOPT_NO_PARTIALCHAIN

Browse Source 
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
This commit is contained in:
Jay Satiro 2019-12-05 19:17:31 -05:00
parent 0edf75865a
commit 689443bf42
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/setopt.c
View File

@ -2142,6 +2142,7 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param)
data->set.proxy_ssl.enable_beast = data->set.proxy_ssl.enable_beast =
(bool)((arg&CURLSSLOPT_ALLOW_BEAST) ? TRUE : FALSE); (bool)((arg&CURLSSLOPT_ALLOW_BEAST) ? TRUE : FALSE);
data->set.proxy_ssl.no_revoke = !!(arg & CURLSSLOPT_NO_REVOKE); data->set.proxy_ssl.no_revoke = !!(arg & CURLSSLOPT_NO_REVOKE);
data->set.proxy_ssl.no_partialchain = !!(arg & CURLSSLOPT_NO_PARTIALCHAIN);
break; break;
#endif #endif

2
packages/OS400/curl.inc.in
View File

@ -760,6 +760,8 @@
d c X'0001' d c X'0001'
d CURLSSLOPT_NO_REVOKE... d CURLSSLOPT_NO_REVOKE...
d c X'0002' d c X'0002'
d CURLSSLOPT_NO_PARTIALCHAIN...
d c X'0004'
* *
d CURL_HET_DEFAULT... d CURL_HET_DEFAULT...
d c 200 d c 200

1
src/tool_setopt.c
View File

@ -124,6 +124,7 @@ const NameValue setopt_nv_CURLUSESSL[] = {
const NameValueUnsigned setopt_nv_CURLSSLOPT[] = { const NameValueUnsigned setopt_nv_CURLSSLOPT[] = {
NV(CURLSSLOPT_ALLOW_BEAST), NV(CURLSSLOPT_ALLOW_BEAST),
NV(CURLSSLOPT_NO_REVOKE), NV(CURLSSLOPT_NO_REVOKE),
NV(CURLSSLOPT_NO_PARTIALCHAIN),
NVEND, NVEND,
}; };