mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

search executable directory as well for SSL CA bundle, closes #3063

This commit is contained in:
IntelOrca 2016-03-01 20:42:29 +00:00
parent d26ee19782
commit 29df98ea9e
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/network/http.cpp
View File

@ -11,6 +11,8 @@ void http_dispose() { }
#else
#include "../core/Math.hpp"
#include "../core/Path.hpp"
#include "../core/String.hpp"
#ifdef __WINDOWS__
// cURL includes windows.h, but we don't need all of it.
@ -19,6 +21,7 @@ void http_dispose() { }
#include <curl/curl.h>
#define MIME_TYPE_APPLICATION_JSON "application/json"
#define DEFAULT_CA_BUNDLE_PATH "curl-ca-bundle.crt"
typedef struct {
char *ptr;
@ -32,9 +35,22 @@ typedef struct {
int capacity;
} write_buffer;
#ifdef __WINDOWS__
static utf8 _caBundlePath[MAX_PATH];
#endif
void http_init()
{
curl_global_init(CURL_GLOBAL_DEFAULT);
#ifdef __WINDOWS__
// Find SSL certificate bundle
platform_get_exe_path(_caBundlePath);
Path::Append(_caBundlePath, sizeof(_caBundlePath), DEFAULT_CA_BUNDLE_PATH);
if (!platform_file_exists(_caBundlePath)) {
String::Set(_caBundlePath, sizeof(_caBundlePath), DEFAULT_CA_BUNDLE_PATH);
}
#endif
}
void http_dispose()
@ -120,7 +136,7 @@ http_json_response *http_request_json(const http_json_request *request)
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, true);
#ifdef __WINDOWS__
// On GNU/Linux (and OS X), curl will use the system certs by default
curl_easy_setopt(curl, CURLOPT_CAINFO, "curl-ca-bundle.crt");
curl_easy_setopt(curl, CURLOPT_CAINFO, _caBundlePath);
#endif
curl_easy_setopt(curl, CURLOPT_URL, request->url);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &writeBuffer);