R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

NetKey system improvements

Browse Source 
* Installed change callback 'NET_UseRandomKeyChanged_f' for cvar 'net_useRandomKey' (when set, it will generate a random key as this is needed when this is enabled!).
This commit is contained in:
Kawe Mazidjatari 2022-08-30 12:10:07 +02:00
parent 1285d15623
commit f8f4504966
4 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
r5dev/engine/net.cpp
View File

@ -82,7 +82,10 @@ void NET_SetKey(const string& svNetKey)
void NET_GenerateKey()
{
if (!net_useRandomKey->GetBool())
{
net_useRandomKey->SetValue(1);
return; // Change callback will handle this.
}
BCRYPT_ALG_HANDLE hAlgorithm;
if (BCryptOpenAlgorithmProvider(&hAlgorithm, L"RNG", 0, 0) < 0)
@ -289,6 +292,6 @@ void NET_Detach()
}
///////////////////////////////////////////////////////////////////////////////
string g_svNetKey = "WDNWLmJYQ2ZlM0VoTid3Yg==";
string g_svNetKey = DEFAULT_NET_ENCRYPTION_KEY;
uintptr_t g_pNetKey = NULL;
#endif // !NETCONSOLE

3
r5dev/engine/net.h
View File

@ -13,7 +13,8 @@
#define NETMSG_LENGTH_BITS 12 // 512 bytes (11 in Valve Source, 256 bytes).
#define NET_MIN_MESSAGE 5 // Even connectionless packets require int32 value (-1) + 1 byte content
#define AES_128_KEY_SIZE 16
constexpr unsigned int AES_128_KEY_SIZE = 16;
constexpr const char* DEFAULT_NET_ENCRYPTION_KEY = "WDNWLmJYQ2ZlM0VoTid3Yg==";
/* ==== CNETCHAN ======================================================================================================================================================== */
inline CMemory p_NET_Init;

22
r5dev/vstdlib/callback.cpp
View File

@ -759,6 +759,28 @@ void NET_GenerateKey_f(const CCommand& args)
{
NET_GenerateKey();
}
/*
=====================
NET_UseRandomKeyChanged_f
Use random AES encryption
key for game packets
=====================
*/
void NET_UseRandomKeyChanged_f(IConVar* pConVar, const char* pOldString, float flOldValue)
{
if (ConVar* pConVarRef = g_pCVar->FindVar(pConVar->GetName()))
{
if (strcmp(pOldString, pConVarRef->GetString()) == NULL)
return; // Same value.
if (pConVarRef->GetBool())
NET_GenerateKey();
else
NET_SetKey(DEFAULT_NET_ENCRYPTION_KEY);
}
}
#ifndef DEDICATED
/*
=====================

1
r5dev/vstdlib/callback.h
View File

@ -35,6 +35,7 @@ void VPK_Unpack_f(const CCommand& args);
void VPK_Mount_f(const CCommand& args);
void NET_SetKey_f(const CCommand& args);
void NET_GenerateKey_f(const CCommand& args);
void NET_UseRandomKeyChanged_f(IConVar* pConVar, const char* pOldString, float flOldValue);
#ifndef DEDICATED
void RCON_CmdQuery_f(const CCommand& args);
void RCON_Disconnect_f(const CCommand& args);