nhyatt/osslsigncode
1
0
Fork 0
mirror of https://github.com/mtrojnar/osslsigncode.git synced 2025-04-05 01:00:11 -05:00
Code Issues Projects Releases Wiki Activity

Squash the unchecked return value from CURL library warning, CID 1519399

Browse Source
This commit is contained in:
olszomal 2023-01-13 14:43:07 +01:00 committed by Michał Trojnara
parent 08c205a02f
commit c4ec6debe5
1 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
osslsigncode.c
View File

@ -1082,19 +1082,29 @@ static int add_timestamp(PKCS7 *sig, char *url, char *proxy, int rfc3161,
/* Start a libcurl easy session and set options for a curl easy handle */ /* Start a libcurl easy session and set options for a curl easy handle */
curl = curl_easy_init(); curl = curl_easy_init();
if (proxy) { if (proxy) {
curl_easy_setopt(curl, CURLOPT_PROXY, proxy); if ((res = curl_easy_setopt(curl, CURLOPT_PROXY, proxy)) != CURLE_OK) {
if (!strncmp("http:", proxy, 5)) printf("CURL failure: %s %s\n", curl_easy_strerror(res), url);
curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_HTTP); }
if (!strncmp("socks:", proxy, 6)) if (!strncmp("http:", proxy, 5) &&
curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5); (res = curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_HTTP)) != CURLE_OK) {
printf("CURL failure: %s %s\n", curl_easy_strerror(res), url);
}
if (!strncmp("socks:", proxy, 6) &&
(res = curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5)) != CURLE_OK) {
printf("CURL failure: %s %s\n", curl_easy_strerror(res), url);
}
}
if ((res = curl_easy_setopt(curl, CURLOPT_URL, url)) != CURLE_OK) {
printf("CURL failure: %s %s\n", curl_easy_strerror(res), url);
} }
curl_easy_setopt(curl, CURLOPT_URL, url);
/* /*
* ask libcurl to show us the verbose output * ask libcurl to show us the verbose output
* curl_easy_setopt(curl, CURLOPT_VERBOSE, 42); * curl_easy_setopt(curl, CURLOPT_VERBOSE, 42);
*/ */
if (noverifypeer) if ((noverifypeer) &&
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, FALSE); (res = curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, FALSE)) != CURLE_OK) {
printf("CURL failure: %s %s\n", curl_easy_strerror(res), url);
}
if (rfc3161) { if (rfc3161) {
slist = curl_slist_append(slist, "Content-Type: application/timestamp-query"); slist = curl_slist_append(slist, "Content-Type: application/timestamp-query");
@ -1105,7 +1115,9 @@ static int add_timestamp(PKCS7 *sig, char *url, char *proxy, int rfc3161,
} }
slist = curl_slist_append(slist, "User-Agent: Transport"); slist = curl_slist_append(slist, "User-Agent: Transport");
slist = curl_slist_append(slist, "Cache-Control: no-cache"); slist = curl_slist_append(slist, "Cache-Control: no-cache");
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist); if ((res = curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist)) != CURLE_OK) {
printf("CURL failure: %s %s\n", curl_easy_strerror(res), url);
}
/* Encode timestamp request */ /* Encode timestamp request */
if (rfc3161) { if (rfc3161) {
@ -1116,14 +1128,24 @@ static int add_timestamp(PKCS7 *sig, char *url, char *proxy, int rfc3161,
if (!bout) if (!bout)
return 1; /* FAILED */ return 1; /* FAILED */
len = BIO_get_mem_data(bout, &p); len = BIO_get_mem_data(bout, &p);
curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, len); if ((res = curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, len)) != CURLE_OK) {
curl_easy_setopt(curl, CURLOPT_POSTFIELDS, (char*)p); printf("CURL failure: %s %s\n", curl_easy_strerror(res), url);
}
if ((res = curl_easy_setopt(curl, CURLOPT_POSTFIELDS, (char*)p)) != CURLE_OK) {
printf("CURL failure: %s %s\n", curl_easy_strerror(res), url);
}
bin = BIO_new(BIO_s_mem()); bin = BIO_new(BIO_s_mem());
BIO_set_mem_eof_return(bin, 0); BIO_set_mem_eof_return(bin, 0);
curl_easy_setopt(curl, CURLOPT_POST, 1); if ((res = curl_easy_setopt(curl, CURLOPT_POST, 1)) != CURLE_OK) {
curl_easy_setopt(curl, CURLOPT_WRITEDATA, bin); printf("CURL failure: %s %s\n", curl_easy_strerror(res), url);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_write); }
if ((res = curl_easy_setopt(curl, CURLOPT_WRITEDATA, bin)) != CURLE_OK) {
printf("CURL failure: %s %s\n", curl_easy_strerror(res), url);
}
if ((res = curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_write)) != CURLE_OK) {
printf("CURL failure: %s %s\n", curl_easy_strerror(res), url);
}
/* Perform the request */ /* Perform the request */
res = curl_easy_perform(curl); res = curl_easy_perform(curl);
curl_slist_free_all(slist); curl_slist_free_all(slist);