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

Added certificate for our vps.

Browse Source
This commit is contained in:
hiker
2014-12-05 13:57:27 +11:00
parent abb486b640
commit 48593534a5
3 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
data/104.131.193.44.pem Normal file
View File

@@ -0,0 +1,24 @@
-----BEGIN CERTIFICATE-----
MIIDxzCCAq+gAwIBAgIJALqBW1fbqtOkMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNV
BAYTAlVTMRMwEQYDVQQIDApTb21lLVN0YXRlMRUwEwYDVQQKDAxTdXBlclR1eEth
cnQxFzAVBgNVBAMMDjEwNC4xMzEuMTkzLjQ0MSYwJAYJKoZIhvcNAQkBFhdoZW5y
aWNoc2pvZXJnQGdtYWlsLmNvbTAeFw0xNDEyMDUwMTE5MjJaFw0xNTEyMDUwMTE5
MjJaMHoxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApTb21lLVN0YXRlMRUwEwYDVQQK
DAxTdXBlclR1eEthcnQxFzAVBgNVBAMMDjEwNC4xMzEuMTkzLjQ0MSYwJAYJKoZI
hvcNAQkBFhdoZW5yaWNoc2pvZXJnQGdtYWlsLmNvbTCCASIwDQYJKoZIhvcNAQEB
BQADggEPADCCAQoCggEBANeRfUfScX6jrLGWZNJBazS3MYzdOPo9hg01YWTlaZaX
pGT/fZdgnZ7eKSuAgbcOPeXDldHO2rfK+6iOgFf7pYI10DhdtXdPl3geBZzU7NC4
V50iH6vkTqiGSCn5pI+1QsAiBdUX7kT/nutL15cjTk0GBVZ6o2OUPFckXDviexOO
MVDbF+9D/GQ9wa4srpTN7yly7Mz2uE8dXS2ewof5JKhjJWJEArSsPvIyU7W/f683
XIzdFM5VZCKVjYdVb5l08ZLh0oseX7muevNi5CkdPUZdjksDhp6B3oS5kMwT3niT
LONe8BB0LklqNEqko46y46Lce6kd+xMkYOTZQJ6Ib/ECAwEAAaNQME4wHQYDVR0O
BBYEFNswiOKhNkwUBj+kAxnVIFePHoJuMB8GA1UdIwQYMBaAFNswiOKhNkwUBj+k
AxnVIFePHoJuMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAIatA3w3
YgAl/9DRHBtMVRW2aOfLmSjbK5VCf9ctEyRkmsMVoMM19UZIalAYEr7O07lSYq2L
ycck09ERq24YH01H6ZtVXr3kL3LiUeHYXpQHjsqL5w200FiICD9NmFTlOhZPI4TI
2Equs13RyZMf1u5kclHytMpBFR7TghlX+x+rLrbEwTXc7UBA3LG524hfsP0LZm1v
BQXwYknV13+cpl5lpNChoX2hQ44Up53hwLIClFFtAkjxYC+LsEm1+Vq/wy9kl5ny
7So9A+B9LIrO99Rl3TPF4yRBBLFA0Nu5c65rwLjrcDduvkU7xk0gIC1T0l9JzWBW
mLmlwKcPweFq7rI=
-----END CERTIFICATE-----

21
data/web.tuxfamily.org.pem
View File

@@ -1,21 +0,0 @@
-----BEGIN CERTIFICATE-----
MIIDYDCCAsmgAwIBAgIJAKYVnmvPe6cJMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNV
BAYTAkZSMQ8wDQYDVQQIEwZGcmFuY2UxEjAQBgNVBAcTCU1hcnNlaWxsZTEuMCwG
A1UEChMlVHV4RmFtaWx5Lm9yZyBub24tcHJvZml0IG9yZ2FuaXphdGlvbjEaMBgG
A1UEAxMRd2ViLnR1eGZhbWlseS5uZXQwHhcNMDgwNTE0MjMzMDI3WhcNMTgwNTEy
MjMzMDI3WjB+MQswCQYDVQQGEwJGUjEPMA0GA1UECBMGRnJhbmNlMRIwEAYDVQQH
EwlNYXJzZWlsbGUxLjAsBgNVBAoTJVR1eEZhbWlseS5vcmcgbm9uLXByb2ZpdCBv
cmdhbml6YXRpb24xGjAYBgNVBAMTEXdlYi50dXhmYW1pbHkubmV0MIGfMA0GCSqG
SIb3DQEBAQUAA4GNADCBiQKBgQCqCWPTYrW59LfzUtMgUFIse9ErIytmnNyVbzk6
11Zj0OTMuCp9ijHW47jqSp7OaOR7X5XmNyhltnidS7elXtVb/jZOINRzdejmLRWs
qBsnvWlab6kx+/u0kLAFH0w6s4Kg2K2s1eHtyid2IZLb+Xl29NGf+C6bRnUq9Bh2
6DF93QIDAQABo4HlMIHiMB0GA1UdDgQWBBSHuse3FoUQ1asK7+4YJ7FxH3tztzCB
sgYDVR0jBIGqMIGngBSHuse3FoUQ1asK7+4YJ7FxH3tzt6GBg6SBgDB+MQswCQYD
VQQGEwJGUjEPMA0GA1UECBMGRnJhbmNlMRIwEAYDVQQHEwlNYXJzZWlsbGUxLjAs
BgNVBAoTJVR1eEZhbWlseS5vcmcgbm9uLXByb2ZpdCBvcmdhbml6YXRpb24xGjAY
BgNVBAMTEXdlYi50dXhmYW1pbHkubmV0ggkAphWea897pwkwDAYDVR0TBAUwAwEB
/zANBgkqhkiG9w0BAQUFAAOBgQBYHLb4pjL7+xTk066JffNe1uCi2xXL93tsuphZ
6LVZkd3y4uIp9yayhUocOws8jptJHtr4TEV5AxS34B89AJgVERcj86K/RVSSwApO
g+ONYIyJ+Xdipdby6TIER+EgQxQJw1cxrMS3zzn7SNuo04CexqOTd5LUrtQJ/dOI
LPEqhw==
-----END CERTIFICATE-----

6
src/online/http_request.cpp
View File

@@ -178,16 +178,16 @@ namespace Online
chunk = curl_slist_append(chunk, "Host: api.stkaddons.net");
curl_easy_setopt(m_curl_session, CURLOPT_HTTPHEADER, chunk);
CURLcode error = curl_easy_setopt(m_curl_session, CURLOPT_CAINFO,
file_manager->getAsset("web.tuxfamily.org.pem").c_str());
file_manager->getAsset("104.131.193.44.pem").c_str());
if (error != CURLE_OK)
{
Log::error("HTTPRequest", "Error setting CAINFO to '%s'",
file_manager->getAsset("web.tuxfamily.org.pem").c_str());
file_manager->getAsset("104.131.193.44.pem").c_str());
Log::error("HTTPRequest", "Error %d: '%s'.", error,
curl_easy_strerror(error));
}
curl_easy_setopt(m_curl_session, CURLOPT_SSL_VERIFYPEER, 1L);
curl_easy_setopt(m_curl_session, CURLOPT_SSL_VERIFYHOST, 0L);
curl_easy_setopt(m_curl_session, CURLOPT_SSL_VERIFYHOST, 1L);
}
} // prepareOperation