metin-server/m2dev-server-src
3
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

XChaCha20-Poly1305 via libsodium

Browse Source
This commit is contained in:
rtw1x1
2026-02-03 11:11:37 +00:00
parent 66068c1bd5
commit db87d068bc
963 changed files with 49428 additions and 264486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/db/ClientManager.cpp
View File

@@ -1211,7 +1211,6 @@ void CClientManager::QUERY_SETUP(CPeer * peer, DWORD dwHandle, const char * c_pD
CLoginData * pkLD = new CLoginData;
pkLD->SetKey(pck->dwLoginKey);
pkLD->SetClientKey(pck->adwClientKey);
pkLD->SetIP(pck->szHost);
TAccountTable & r = pkLD->GetAccountRef();
@@ -1748,7 +1747,6 @@ void CClientManager::QUERY_AUTH_LOGIN(CPeer * pkPeer, DWORD dwHandle, TPacketGDA
CLoginData * pkLD = new CLoginData;
pkLD->SetKey(p->dwLoginKey);
pkLD->SetClientKey(p->adwClientKey);
pkLD->SetPremium(p->iPremiumTimes);
TAccountTable & r = pkLD->GetAccountRef();
@@ -1758,9 +1756,8 @@ void CClientManager::QUERY_AUTH_LOGIN(CPeer * pkPeer, DWORD dwHandle, TPacketGDA
strlcpy(r.social_id, p->szSocialID, sizeof(r.social_id));
strlcpy(r.passwd, "TEMP", sizeof(r.passwd));
sys_log(0, "AUTH_LOGIN id(%u) login(%s) social_id(%s) login_key(%u), client_key(%u %u %u %u)",
p->dwID, p->szLogin, p->szSocialID, p->dwLoginKey,
p->adwClientKey[0], p->adwClientKey[1], p->adwClientKey[2], p->adwClientKey[3]);
sys_log(0, "AUTH_LOGIN id(%u) login(%s) social_id(%s) login_key(%u)",
p->dwID, p->szLogin, p->szSocialID, p->dwLoginKey);
bResult = 1;

13
src/db/ClientManagerLogin.cpp
View File

@@ -110,19 +110,6 @@ void CClientManager::QUERY_LOGIN_BY_KEY(CPeer * pkPeer, DWORD dwHandle, TPacketG
return;
}
if (memcmp(pkLoginData->GetClientKey(), p->adwClientKey, sizeof(uint32_t) * 4))
{
const uint32_t * pdwClientKey = pkLoginData->GetClientKey();
sys_log(0, "LOGIN_BY_KEY client key differ %s %lu %lu %lu %lu, %lu %lu %lu %lu",
r.login,
p->adwClientKey[0], p->adwClientKey[1], p->adwClientKey[2], p->adwClientKey[3],
pdwClientKey[0], pdwClientKey[1], pdwClientKey[2], pdwClientKey[3]);
pkPeer->EncodeReturn(HEADER_DG_LOGIN_NOT_EXIST, dwHandle);
return;
}
TAccountTable * pkTab = new TAccountTable;
memset(pkTab, 0, sizeof(TAccountTable));

11
src/db/LoginData.cpp
View File

@@ -5,7 +5,6 @@
CLoginData::CLoginData()
{
m_dwKey = 0;
memset(m_adwClientKey, 0, sizeof(m_adwClientKey));
m_dwConnectedPeerHandle = 0;
m_dwLogonTime = 0;
memset(m_szIP, 0, sizeof(m_szIP));
@@ -22,16 +21,6 @@ TAccountTable & CLoginData::GetAccountRef()
return m_data;
}
void CLoginData::SetClientKey(const uint32_t* c_pdwClientKey)
{
thecore_memcpy(&m_adwClientKey, c_pdwClientKey, sizeof(uint32_t) * 4);
}
const uint32_t * CLoginData::GetClientKey()
{
return &m_adwClientKey[0];
}
void CLoginData::SetKey(DWORD dwKey)
{
m_dwKey = dwKey;

4
src/db/LoginData.h
View File

@@ -8,9 +8,6 @@ class CLoginData
CLoginData();
TAccountTable & GetAccountRef();
void SetClientKey(const uint32_t * c_pdwClientKey);
const uint32_t* GetClientKey();
void SetKey(DWORD dwKey);
DWORD GetKey();
@@ -40,7 +37,6 @@ class CLoginData
private:
DWORD m_dwKey;
uint32_t m_adwClientKey[4];
DWORD m_dwConnectedPeerHandle;
DWORD m_dwLogonTime;
char m_szIP[MAX_HOST_LENGTH+1];