mirror of
https://github.com/moparisthebest/curl
synced 2024-12-21 23:58:49 -05:00
curl now uses stricter VERIFYHOST by default and only uses a lesser check
if --insecure is used. Reported by Hamish Mackenzie.
This commit is contained in:
parent
169b2eeb94
commit
f2c6057490
12
src/main.c
12
src/main.c
@ -2828,6 +2828,8 @@ operate(struct Configurable *config, int argc, char *argv[])
|
||||
curl_easy_setopt(curl, CURLOPT_SSLKEYTYPE, config->key_type);
|
||||
curl_easy_setopt(curl, CURLOPT_SSLKEYPASSWD, config->key_passwd);
|
||||
|
||||
/* default to strict verifyhost */
|
||||
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 2);
|
||||
if(config->cacert || config->capath) {
|
||||
if (config->cacert)
|
||||
curl_easy_setopt(curl, CURLOPT_CAINFO, config->cacert);
|
||||
@ -2835,15 +2837,13 @@ operate(struct Configurable *config, int argc, char *argv[])
|
||||
if (config->capath)
|
||||
curl_easy_setopt(curl, CURLOPT_CAPATH, config->capath);
|
||||
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, TRUE);
|
||||
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 2);
|
||||
}
|
||||
else {
|
||||
if(config->insecure_ok)
|
||||
else
|
||||
if(config->insecure_ok) {
|
||||
/* new stuff needed for libcurl 7.10 */
|
||||
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, FALSE);
|
||||
|
||||
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 1);
|
||||
}
|
||||
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 1);
|
||||
}
|
||||
|
||||
if((config->conf&CONF_NOBODY) ||
|
||||
config->remote_time) {
|
||||
|
Loading…
Reference in New Issue
Block a user