edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 14:38:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the secure RNG for network tokens

Browse source 
These tokens benefit from being unpredictable by an adversary, so let's
make them unpredictable.
This commit is contained in:
heinrich5991 2019-03-17 22:54:52 +01:00
parent 594796cd42
commit 0edf336426
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/engine/client/client.cpp
View file

@ -2534,6 +2534,12 @@ int main(int argc, const char **argv) // ignore_convention
}
}
if(secure_random_init() != 0)
{
dbg_msg("secure", "could not initialize secure RNG");
return -1;
}
CClient *pClient = CreateClient();
IKernel *pKernel = IKernel::Create();
pKernel->RegisterInterface(pClient);

6
src/engine/server/server.cpp
View file

@ -1778,11 +1778,10 @@ int main(int argc, const char **argv) // ignore_convention
}
}
bool SkipPWGen = false;
if(secure_random_init() != 0)
{
dbg_msg("secure", "could not initialize secure RNG");
SkipPWGen = true; // skip automatic password generation
return -1;
}
CServer *pServer = CreateServer();
@ -1841,8 +1840,7 @@ int main(int argc, const char **argv) // ignore_convention
pEngine->InitLogfile();
if(!SkipPWGen)
pServer->InitRconPasswordIfUnset();
pServer->InitRconPasswordIfUnset();
// run the server
dbg_msg("server", "starting...");

6
src/engine/shared/network_token.cpp
View file

@ -77,11 +77,7 @@ void CNetTokenManager::GenerateSeed()
static const NETADDR NullAddr = { 0 };
m_PrevSeed = m_Seed;
for(int i = 0; i < 2; i++)
{
m_Seed <<= 32;
m_Seed ^= random_int();
}
secure_random_fill(&m_Seed, sizeof(m_Seed));
m_PrevGlobalToken = m_GlobalToken;
m_GlobalToken = GenerateToken(&NullAddr);