f7cac7cc07
Daniel Stenberg
2025-09-14
Subject
setopt: accept *_SSL_VERIFYHOST set to 2L
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
lib/setopt.c+6 -2
| @@ -443,6 +443,7 @@ static CURLcode setopt_bool(struct Curl_easy *data, CURLoption option, | |
| long arg, bool *set) | |
| { | |
| bool enabled = !!arg; | |
| + | int ok = 1; |
| struct UserDefined *s = &data->set; | |
| switch(option) { | |
| case CURLOPT_FORBID_REUSE: | |
| @@ -619,7 +620,7 @@ static CURLcode setopt_bool(struct Curl_easy *data, CURLoption option, | |
| * Enable verification of the hostname in the peer certificate for proxy | |
| */ | |
| s->proxy_ssl.primary.verifyhost = enabled; | |
| - | |
| + | ok = 2; |
| /* Update the current connection proxy_ssl_config. */ | |
| Curl_ssl_conn_config_update(data, TRUE); | |
| break; | |
| @@ -723,6 +724,7 @@ static CURLcode setopt_bool(struct Curl_easy *data, CURLoption option, | |
| * Enable verification of the hostname in the peer certificate for DoH | |
| */ | |
| s->doh_verifyhost = enabled; | |
| + | ok = 2; |
| break; | |
| case CURLOPT_DOH_SSL_VERIFYSTATUS: | |
| /* | |
| @@ -732,6 +734,7 @@ static CURLcode setopt_bool(struct Curl_easy *data, CURLoption option, | |
| return CURLE_NOT_BUILT_IN; | |
| s->doh_verifystatus = enabled; | |
| + | ok = 2; |
| break; | |
| #endif /* ! CURL_DISABLE_DOH */ | |
| case CURLOPT_SSL_VERIFYHOST: | |
| @@ -743,6 +746,7 @@ static CURLcode setopt_bool(struct Curl_easy *data, CURLoption option, | |
| this argument took a boolean when it was not and misused it. | |
| Treat 1 and 2 the same */ | |
| s->ssl.primary.verifyhost = enabled; | |
| + | ok = 2; |
| /* Update the current connection ssl_config. */ | |
| Curl_ssl_conn_config_update(data, FALSE); | |
| @@ -844,7 +848,7 @@ static CURLcode setopt_bool(struct Curl_easy *data, CURLoption option, | |
| default: | |
| return CURLE_OK; | |
| } | |
| - | if((arg > 1) || (arg < 0)) |
| + | if((arg > ok) || (arg < 0)) |
| /* reserve other values for future use */ | |
| infof(data, "boolean setopt(%d) got unsupported argument %ld," | |
| " treated as %d", option, arg, enabled); | |