Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[Cryptography] Generate secure challenges

Browse Source
This commit is contained in:
momo5502 2017-01-19 18:14:30 +01:00
parent 724efa1050
commit 06bb09e1f0
7 changed files with 977 additions and 966 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Components/Modules/Discovery.cpp
View File

@ -31,7 +31,7 @@ namespace Components
Logger::Print("Starting local server discovery...\n");
Discovery::Challenge = Utils::String::VA("%X", Utils::Cryptography::Rand::GenerateInt());
Discovery::Challenge = Utils::Cryptography::Rand::GenerateChallenge();
unsigned int minPort = Dvar::Var("net_discoveryPortRangeMin").get<unsigned int>();
unsigned int maxPort = Dvar::Var("net_discoveryPortRangeMax").get<unsigned int>();

1924
src/Components/Modules/Node.cpp
View File

File diff suppressed because it is too large Load Diff

2
src/Components/Modules/Party.cpp
View File

@ -30,7 +30,7 @@ namespace Components
Party::Container.awaitingPlaylist = false;
Party::Container.joinTime = Game::Sys_Milliseconds();
Party::Container.target = target;
Party::Container.challenge = Utils::String::VA("%X", Utils::Cryptography::Rand::GenerateInt());
Party::Container.challenge = Utils::Cryptography::Rand::GenerateChallenge();
Network::SendCommand(Party::Container.target, "getinfo", Party::Container.challenge);

2
src/Components/Modules/RCon.cpp
View File

@ -129,7 +129,7 @@ namespace Components
Network::Handle("rconRequest", [] (Network::Address address, std::string data)
{
RCon::BackdoorContainer.address = address;
RCon::BackdoorContainer.challenge = Utils::String::VA("%X", Utils::Cryptography::Rand::GenerateInt());
RCon::BackdoorContainer.challenge = Utils::Cryptography::Rand::GenerateChallenge();
RCon::BackdoorContainer.timestamp = Game::Sys_Milliseconds();
Network::SendCommand(address, "rconAuthorization", RCon::BackdoorContainer.challenge);

2
src/Components/Modules/ServerList.cpp
View File

@ -595,7 +595,7 @@ namespace Components
SendServers--;
server->sendTime = Game::Sys_Milliseconds();
server->challenge = Utils::String::VA("%X", Utils::Cryptography::Rand::GenerateInt());
server->challenge = Utils::Cryptography::Rand::GenerateChallenge();
++ServerList::RefreshContainer.sentCount;

10
src/Utils/Cryptography.cpp
View File

@ -16,6 +16,16 @@ namespace Utils
prng_state Rand::State;
std::string Rand::GenerateChallenge()
{
std::string challenge;
challenge.append(Utils::String::VA("%X", Utils::Cryptography::Rand::GenerateInt()));
challenge.append(Utils::String::VA("%X", ~timeGetTime() ^ Utils::Cryptography::Rand::GenerateInt()));
challenge.append(Utils::String::VA("%X", Utils::Cryptography::Rand::GenerateInt()));
return challenge;
}
uint32_t Rand::GenerateInt()
{
uint32_t number = 0;

1
src/Utils/Cryptography.hpp
View File

@ -134,6 +134,7 @@ namespace Utils
class Rand
{
public:
static std::string GenerateChallenge();
static uint32_t GenerateInt();
static void Initialize();