flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Authenticator.cpp: Killed a global destructor warning

Browse Source
This commit is contained in:
archshift 2014-07-18 21:38:55 -07:00
parent 76b33970b0
commit f94cf49980
1 changed files with 56 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Protocol/Authenticator.cpp
View File

@ -20,7 +20,9 @@
/** This is the data of the root certs for Starfield Technologies, the CA that signed sessionserver.mojang.com's cert:
Downloaded from http://certs.starfieldtech.com/repository/ */
static const AString gStarfieldCACert(
static const AString StarfieldCACert()
{
return AString(
// G2 cert
"-----BEGIN CERTIFICATE-----\n"
"MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMx\n"
@ -70,7 +72,8 @@ static const AString gStarfieldCACert(
"VSJYACPq4xJDKVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEY\n"
"WQPJIrSPnNVeKtelttQKbfi3QBFGmh95DmK/D5fs4C8fF5Q=\n"
"-----END CERTIFICATE-----\n"
);
);
}
@ -263,7 +266,7 @@ bool cAuthenticator::AuthWithYggdrasil(AString & a_UserName, const AString & a_S
Request += "\r\n";
AString Response;
if (!SecureGetFromAddress(gStarfieldCACert, m_Server, Request, Response))
if (!SecureGetFromAddress(StarfieldCACert(), m_Server, Request, Response))
{
return false;
}
@ -343,7 +346,7 @@ bool cAuthenticator::GetPlayerProperties(const AString & a_UUID, Json::Value & a
Request += "\r\n";
AString Response;
if (!ConnectSecurelyToAddress(gStarfieldCACert, m_Server, Request, Response))
if (!ConnectSecurelyToAddress(StarfieldCACert(), m_Server, Request, Response))
{
return false;
}