mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[project @ 2004-06-10 22:40:56 by jmb] 

Allow configuration of SSL certificate verification

svn path=/import/netsurf/; revision=955
This commit is contained in:
John Mark Bell 2004-06-10 22:40:56 +00:00
parent bd6ec25190
commit e6cec7dbe8
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
content/fetch.c
View File

@ -149,6 +149,14 @@ void fetch_init(void)
SETOPT(CURLOPT_CAINFO, ca_bundle); SETOPT(CURLOPT_CAINFO, ca_bundle);
#endif #endif
if (!option_ssl_verify_certificates) {
/* disable verification of SSL certificates.
* security? we've heard of it...
*/
SETOPT(CURLOPT_SSL_VERIFYPEER, 0L);
SETOPT(CURLOPT_SSL_VERIFYHOST, 0L);
}
return; return;
curl_easy_setopt_failed: curl_easy_setopt_failed:
@ -601,7 +609,7 @@ size_t fetch_curl_data(void * data, size_t size, size_t nmemb, struct fetch *f)
size_t fetch_curl_header(char * data, size_t size, size_t nmemb, struct fetch *f) size_t fetch_curl_header(char * data, size_t size, size_t nmemb, struct fetch *f)
{ {
unsigned int i; int i;
size *= nmemb; size *= nmemb;
if (12 < size && strncasecmp(data, "Location:", 9) == 0) { if (12 < size && strncasecmp(data, "Location:", 9) == 0) {
/* extract Location header */ /* extract Location header */
@ -611,7 +619,7 @@ size_t fetch_curl_header(char * data, size_t size, size_t nmemb, struct fetch *f
LOG(("malloc failed")); LOG(("malloc failed"));
return size; return size;
} }
for (i = 9; i < size && (data[i] == ' ' || data[i] == '\t'); i++) for (i = 9; i < (int)size && (data[i] == ' ' || data[i] == '\t'); i++)
/* */; /* */;
strncpy(f->location, data + i, size - i); strncpy(f->location, data + i, size - i);
f->location[size - i] = '\0'; f->location[size - i] = '\0';
@ -623,7 +631,7 @@ size_t fetch_curl_header(char * data, size_t size, size_t nmemb, struct fetch *f
f->location[i] = '\0'; f->location[i] = '\0';
} else if (15 < size && strncasecmp(data, "Content-Length:", 15) == 0) { } else if (15 < size && strncasecmp(data, "Content-Length:", 15) == 0) {
/* extract Content-Length header */ /* extract Content-Length header */
for (i = 15; i < size && (data[i] == ' ' || data[i] == '\t'); i++) for (i = 15; i < (int)size && (data[i] == ' ' || data[i] == '\t'); i++)
/* */; /* */;
if ('0' <= data[i] && data[i] <= '9') if ('0' <= data[i] && data[i] <= '9')
f->content_length = atol(data + i); f->content_length = atol(data + i);
@ -636,9 +644,9 @@ size_t fetch_curl_header(char * data, size_t size, size_t nmemb, struct fetch *f
LOG(("malloc failed")); LOG(("malloc failed"));
return size; return size;
} }
for (i = 16; i < size && data[i] != '='; i++) for (i = 16; i < (int)size && data[i] != '='; i++)
/* */; /* */;
while (i < size && data[++i] == '"') while (i < (int)size && data[++i] == '"')
/* */; /* */;
strncpy(f->realm, data + i, size - i); strncpy(f->realm, data + i, size - i);
f->realm[size - i] = '\0'; f->realm[size - i] = '\0';

3
desktop/options.c
View File

@ -41,6 +41,8 @@ int option_font_size = 100;
int option_font_min_size = 70; int option_font_min_size = 70;
/** Accept-Language header. */ /** Accept-Language header. */
char *option_accept_language = 0; char *option_accept_language = 0;
/** Strict verification of SSL sertificates */
bool option_ssl_verify_certificates = true;
EXTRA_OPTION_DEFINE EXTRA_OPTION_DEFINE
@ -56,6 +58,7 @@ struct {
{ "font_size", OPTION_INTEGER, &option_font_size }, { "font_size", OPTION_INTEGER, &option_font_size },
{ "font_min_size", OPTION_INTEGER, &option_font_min_size }, { "font_min_size", OPTION_INTEGER, &option_font_min_size },
{ "accept_language", OPTION_STRING, &option_accept_language }, { "accept_language", OPTION_STRING, &option_accept_language },
{ "ssl_verify_certificates", OPTION_BOOL, &option_ssl_verify_certificates },
EXTRA_OPTION_TABLE EXTRA_OPTION_TABLE
}; };

1
desktop/options.h
View File

@ -30,6 +30,7 @@ extern int option_http_proxy_port;
extern int option_font_size; extern int option_font_size;
extern int option_font_min_size; extern int option_font_min_size;
extern char *option_accept_language; extern char *option_accept_language;
extern bool option_ssl_verify_certificates;
void options_read(const char *path); void options_read(const char *path);
void options_write(const char *path); void options_write(const char *path);