ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed option to disable CURLOPT_SSL_VERIFYPEER, since it's not needed

Browse Source 
anymore.
This commit is contained in:
hiker 2014-12-10 12:55:32 +11:00
parent 93b4aa15c2
commit f0ddaa50a5
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/config/user_config.hpp
View File

@ -768,11 +768,6 @@ namespace UserConfigParams
&m_online_group, &m_online_group,
"Version of the server API to use.")); "Version of the server API to use."));
PARAM_PREFIX BoolUserConfigParam m_verify_peer
PARAM_DEFAULT(BoolUserConfigParam(1, "verify-peer", &m_online_group,
"If curl should check peer address. Should always be enabled,"
"unless there are authentication problems."));
// ---- Addon server related entries // ---- Addon server related entries
PARAM_PREFIX GroupUserConfigParam m_addon_group PARAM_PREFIX GroupUserConfigParam m_addon_group

7
src/online/http_request.cpp
View File

@ -186,14 +186,7 @@ namespace Online
Log::error("HTTPRequest", "Error %d: '%s'.", error, Log::error("HTTPRequest", "Error %d: '%s'.", error,
curl_easy_strerror(error)); curl_easy_strerror(error));
} }
// In case that there are authentication problems (e.g. on osx)
// disable peer verification. Not ideal, but still better than
// no encryption.
if (UserConfigParams::m_verify_peer)
curl_easy_setopt(m_curl_session, CURLOPT_SSL_VERIFYPEER, 1L); curl_easy_setopt(m_curl_session, CURLOPT_SSL_VERIFYPEER, 1L);
else
curl_easy_setopt(m_curl_session, CURLOPT_SSL_VERIFYPEER, 0L);
#ifdef __APPLE__ #ifdef __APPLE__
curl_easy_setopt(m_curl_session, CURLOPT_SSL_VERIFYHOST, 0L); curl_easy_setopt(m_curl_session, CURLOPT_SSL_VERIFYHOST, 0L);
#else #else