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

Add reversed 'CNetKey' class

Browse Source 
Confirmed size, mostly unknown still. But some of this seems to be data related to OpenSSL.
This commit is contained in:
Kawe Mazidjatari 2023-02-12 02:15:58 +01:00
parent 5f7bf4414e
commit 0734d56fe2
11 changed files with 71 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
r5dev/engine/net.cpp
View File

@ -302,5 +302,5 @@ void VNet::Detach() const
///////////////////////////////////////////////////////////////////////////////
string g_svNetKey = DEFAULT_NET_ENCRYPTION_KEY;
uintptr_t g_pNetKey = NULL;
netkey_t* g_pNetKey = nullptr;
#endif // !NETCONSOLE

10
r5dev/engine/net.h
View File

@ -25,7 +25,7 @@ inline CMemory p_NET_Shutdown;
inline auto v_NET_Shutdown = p_NET_Shutdown.RCast<void (*)(void* thisptr, const char* szReason, uint8_t bBadRep, bool bRemoveNow)>();
inline CMemory p_NET_SetKey;
inline auto v_NET_SetKey = p_NET_SetKey.RCast<void (*)(uintptr_t pKey, const char* szHash)>();
inline auto v_NET_SetKey = p_NET_SetKey.RCast<void (*)(netkey_t* pKey, const char* szHash)>();
inline CMemory p_NET_ReceiveDatagram;
inline auto v_NET_ReceiveDatagram = p_NET_ReceiveDatagram.RCast<bool (*)(int iSocket, netpacket_s* pInpacket, bool bRaw)>();
@ -47,7 +47,7 @@ void NET_RemoveChannel(CClient* pClient, int nIndex, const char* szReason, uint8
///////////////////////////////////////////////////////////////////////////////
extern string g_svNetKey;
extern uintptr_t g_pNetKey;
extern netkey_t* g_pNetKey;
inline std::mutex g_NetKeyMutex;
///////////////////////////////////////////////////////////////////////////////
@ -61,7 +61,7 @@ class VNet : public IDetour
LogFunAdr("NET_ReceiveDatagram", p_NET_ReceiveDatagram.GetPtr());
LogFunAdr("NET_SendDatagram", p_NET_SendDatagram.GetPtr());
LogFunAdr("NET_PrintFunc", p_NET_PrintFunc.GetPtr());
LogVarAdr("g_NetKey", g_pNetKey);
LogVarAdr("g_NetKey", reinterpret_cast<uintptr_t>(g_pNetKey));
}
virtual void GetFun(void) const
{
@ -79,7 +79,7 @@ class VNet : public IDetour
v_NET_Init = p_NET_Init.RCast<void* (*)(bool)>(); /*48 89 5C 24 08 48 89 6C 24 10 48 89 74 24 18 48 89 7C 24 20 41 54 41 56 41 57 48 81 EC F0 01 00*/
v_NET_Shutdown = p_NET_Shutdown.RCast<void (*)(void*, const char*, uint8_t, bool)>(); /*48 89 6C 24 18 56 57 41 56 48 83 EC 30 83 B9 D0*/
v_NET_SetKey = p_NET_SetKey.RCast<void (*)(uintptr_t, const char*)>(); /*48 89 5C 24 08 48 89 6C 24 10 48 89 74 24 18 57 48 83 EC 20 48 8B F9 41 B8*/
v_NET_SetKey = p_NET_SetKey.RCast<void (*)(netkey_t*, const char*)>(); /*48 89 5C 24 08 48 89 6C 24 10 48 89 74 24 18 57 48 83 EC 20 48 8B F9 41 B8*/
v_NET_ReceiveDatagram = p_NET_ReceiveDatagram.RCast<bool (*)(int, netpacket_s*, bool)>(); /*E8 ?? ?? ?? ?? 84 C0 75 35 48 8B D3*/
v_NET_SendDatagram = p_NET_SendDatagram.RCast<int (*)(SOCKET, void*, int, netadr_t*, bool)>(); /*48 89 5C 24 08 48 89 6C 24 10 48 89 74 24 18 57 41 56 41 57 48 81 EC ?? 05 00 00*/
v_NET_PrintFunc = p_NET_PrintFunc.RCast<void(*)(const char*)>(); /*48 89 54 24 10 4C 89 44 24 18 4C 89 4C 24 20 C3 48*/
@ -87,7 +87,7 @@ class VNet : public IDetour
}
virtual void GetVar(void) const
{
g_pNetKey = g_GameDll.FindString("client:NetEncryption_NewKey").FindPatternSelf("48 8D ?? ?? ?? ?? ?? 48 3B", CMemory::Direction::UP, 300).ResolveRelativeAddressSelf(0x3, 0x7).GetPtr();
g_pNetKey = g_GameDll.FindString("client:NetEncryption_NewKey").FindPatternSelf("48 8D ?? ?? ?? ?? ?? 48 3B", CMemory::Direction::UP, 300).ResolveRelativeAddressSelf(0x3, 0x7).RCast<netkey_t*>();
}
virtual void GetCon(void) const { }
virtual void Attach(void) const;

1
r5dev/engine/net_chan.h
View File

@ -9,6 +9,7 @@
#include "tier1/bitbuf.h"
#include "tier1/NetAdr.h"
#include "tier1/NetKey.h"
#include "tier1/utlmemory.h"
#include "tier1/utlvector.h"
#include "common/netmessages.h"

15
r5dev/tier1/NetKey.cpp Normal file
View File

@ -0,0 +1,15 @@
//===========================================================================//
//
// Purpose: implementation of the CNetKey class.
// --------------------------------------------------------------------------
//===========================================================================//
#include "core/stdafx.h"
#include "NetKey.h"
//////////////////////////////////////////////////////////////////////
// Get key as Base64.
//////////////////////////////////////////////////////////////////////
const char* CNetKey::GetBase64NetKey(void) const
{
return m_szBase64;
}

25
r5dev/tier1/NetKey.h Normal file
View File

@ -0,0 +1,25 @@
#pragma once
#include "NetAdr.h"
class CNetKey
{
public:
const char* GetBase64NetKey(void) const;
private:
netadr_t m_Adr;
char m_Pad0[0x18];
char m_UnkData0[0xFF0];
char m_Pad1[0x40];
char m_UnkData1[0xC0];
char m_Pad2[0x160];
LPCRITICAL_SECTION m_Mutex;
char m_Pad3[0x20];
bool m_bUnknown;
char m_RandomUnknown[0x23];
int m_nSize;
char m_szBase64[0x2D];
};
static_assert(sizeof(CNetKey) == 0x1300);
typedef class CNetKey netkey_t;

2
r5dev/vproj/clientsdk.vcxproj
View File

@ -142,6 +142,7 @@
<ClCompile Include="..\tier1\generichash.cpp" />
<ClCompile Include="..\tier1\IConVar.cpp" />
<ClCompile Include="..\tier1\NetAdr.cpp" />
<ClCompile Include="..\tier1\NetKey.cpp" />
<ClCompile Include="..\tier1\splitstring.cpp" />
<ClCompile Include="..\tier1\strtools.cpp" />
<ClCompile Include="..\tier1\utlbuffer.cpp" />
@ -578,6 +579,7 @@
<ClInclude Include="..\tier1\IConVar.h" />
<ClInclude Include="..\tier1\mempool.h" />
<ClInclude Include="..\tier1\NetAdr.h" />
<ClInclude Include="..\tier1\NetKey.h" />
<ClInclude Include="..\tier1\strtools.h" />
<ClInclude Include="..\tier1\utlblockmemory.h" />
<ClInclude Include="..\tier1\utlbuffer.h" />

6
r5dev/vproj/clientsdk.vcxproj.filters
View File

@ -684,6 +684,9 @@
<ClCompile Include="..\vstdlib\autocompletefilelist.cpp">
<Filter>sdk\vstdlib</Filter>
</ClCompile>
<ClCompile Include="..\tier1\NetKey.cpp">
<Filter>sdk\tier1</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\client\cdll_engine_int.h">
@ -2012,6 +2015,9 @@
<ClInclude Include="..\thirdparty\nlohmann\detail\meta\std_fs.hpp">
<Filter>thirdparty\nlohmann\detail\meta</Filter>
</ClInclude>
<ClInclude Include="..\tier1\NetKey.h">
<Filter>sdk\tier1</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="..\shared\resource\lockedserver.png">

2
r5dev/vproj/dedicated.vcxproj
View File

@ -501,6 +501,7 @@
<ClInclude Include="..\tier1\IConVar.h" />
<ClInclude Include="..\tier1\mempool.h" />
<ClInclude Include="..\tier1\NetAdr.h" />
<ClInclude Include="..\tier1\NetKey.h" />
<ClInclude Include="..\tier1\strtools.h" />
<ClInclude Include="..\tier1\utlblockmemory.h" />
<ClInclude Include="..\tier1\utlbuffer.h" />
@ -650,6 +651,7 @@
<ClCompile Include="..\tier1\generichash.cpp" />
<ClCompile Include="..\tier1\IConVar.cpp" />
<ClCompile Include="..\tier1\NetAdr.cpp" />
<ClCompile Include="..\tier1\NetKey.cpp" />
<ClCompile Include="..\tier1\splitstring.cpp" />
<ClCompile Include="..\tier1\strtools.cpp" />
<ClCompile Include="..\tier1\utlbuffer.cpp" />

6
r5dev/vproj/dedicated.vcxproj.filters
View File

@ -1395,6 +1395,9 @@
<ClInclude Include="..\thirdparty\nlohmann\detail\meta\std_fs.hpp">
<Filter>thirdparty\nlohmann\detail\meta</Filter>
</ClInclude>
<ClInclude Include="..\tier1\NetKey.h">
<Filter>sdk\tier1</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\common\opcodes.cpp">
@ -1781,6 +1784,9 @@
<ClCompile Include="..\vstdlib\autocompletefilelist.cpp">
<Filter>sdk\vstdlib</Filter>
</ClCompile>
<ClCompile Include="..\tier1\NetKey.cpp">
<Filter>sdk\tier1</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\Dedicated.def" />

2
r5dev/vproj/gamesdk.vcxproj
View File

@ -161,6 +161,7 @@
<ClCompile Include="..\tier1\generichash.cpp" />
<ClCompile Include="..\tier1\IConVar.cpp" />
<ClCompile Include="..\tier1\NetAdr.cpp" />
<ClCompile Include="..\tier1\NetKey.cpp" />
<ClCompile Include="..\tier1\splitstring.cpp" />
<ClCompile Include="..\tier1\strtools.cpp" />
<ClCompile Include="..\tier1\utlbuffer.cpp" />
@ -632,6 +633,7 @@
<ClInclude Include="..\tier1\IConVar.h" />
<ClInclude Include="..\tier1\mempool.h" />
<ClInclude Include="..\tier1\NetAdr.h" />
<ClInclude Include="..\tier1\NetKey.h" />
<ClInclude Include="..\tier1\strtools.h" />
<ClInclude Include="..\tier1\utlblockmemory.h" />
<ClInclude Include="..\tier1\utlbuffer.h" />

6
r5dev/vproj/gamesdk.vcxproj.filters
View File

@ -750,6 +750,9 @@
<ClCompile Include="..\vstdlib\autocompletefilelist.cpp">
<Filter>sdk\vstdlib</Filter>
</ClCompile>
<ClCompile Include="..\tier1\NetKey.cpp">
<Filter>sdk\tier1</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\client\cdll_engine_int.h">
@ -2183,6 +2186,9 @@
<ClInclude Include="..\thirdparty\nlohmann\detail\abi_macros.hpp">
<Filter>thirdparty\nlohmann\detail</Filter>
</ClInclude>
<ClInclude Include="..\tier1\NetKey.h">
<Filter>sdk\tier1</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="..\shared\resource\lockedserver.png">