moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

curl now uses stricter VERIFYHOST by default and only uses a lesser check

Browse Source 
if --insecure is used. Reported by Hamish Mackenzie.
This commit is contained in:
Daniel Stenberg 2003-01-30 05:15:57 +00:00
parent 169b2eeb94
commit f2c6057490
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main.c
View File

@ -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_SSLKEYTYPE, config->key_type);
curl_easy_setopt(curl, CURLOPT_SSLKEYPASSWD, config->key_passwd); 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 || config->capath) {
if (config->cacert) if (config->cacert)
curl_easy_setopt(curl, CURLOPT_CAINFO, 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) if (config->capath)
curl_easy_setopt(curl, CURLOPT_CAPATH, config->capath); curl_easy_setopt(curl, CURLOPT_CAPATH, config->capath);
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, TRUE); curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, TRUE);
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 2);
} }
else { else
if(config->insecure_ok) if(config->insecure_ok) {
/* new stuff needed for libcurl 7.10 */ /* new stuff needed for libcurl 7.10 */
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, FALSE); 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) || if((config->conf&CONF_NOBODY) ||
config->remote_time) { config->remote_time) {