clank/rodecomp
1
0
Fork 0
Code Issues Wiki Activity

Maintenance: Centralize the 4 remaining EncryptedText copies (GameModePackets, ServiceConfiguration, SoundConfiguration, AccountLinke

Browse source 
Batch #16859 by ragnarok-clanker: no function's compiled code changes; checked with 4 compiled unit(s).
This commit is contained in:
ragnarok-clanker 2026-11-11 10:16:02 +00:00
commit 79f71f3dd4
4 changed files with 10 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Source/Client/Mode/GameModePackets.cpp
View file

@ -146,6 +146,7 @@
#include "UI/Guild/UIGuild_Storage_Log.h"
#include "Contents/Actors/GroundScope.h"
#include "Contents/Ground/TerrainHeight.h"
#include "Utility/Cipher/LocalEncryptedName.h"
#include <new>
// OFFSET: 0x00D7AF70
@ -178,7 +179,6 @@ void __fastcall RefreshPartyWindows(CSession* session);
// GLOBAL: gl_24992
char g_pendingWhisperCount;
namespace {
#pragma pack(push, 1)
struct SimulationPacketHeader {
@ -4538,7 +4538,6 @@ void CGameMode::ReceiveParChange(unsigned char* data) {
g_modeMgr.GetGameMode();
std::string text;
switch (packet->type) {
case SP_SPEED:
if (*reinterpret_cast<int*>(&g_session.healthPoints[0]) != packet->value) {
@ -15610,37 +15609,6 @@ void CGameMode::ReceiveTaggedBroadcast(const unsigned char* data) {
}
}
namespace {
template <std::size_t Length, std::uint64_t Key>
class EncryptedText {
public:
explicit EncryptedText(const std::uint8_t (&source)[Length]) : m_encrypted(true) {
for (std::uint64_t index = 0; index < Length; ++index) {
this->m_text[index] = source[index];
}
}
~EncryptedText() {
for (std::uint64_t index = 0; index < Length; ++index) {
this->m_text[index] = 0;
}
}
const char* Text() {
if (this->m_encrypted) {
utility::XorBytes(this->m_text, Length, Key);
this->m_encrypted = false;
}
return reinterpret_cast<const char*>(this->m_text);
}
private:
std::uint8_t m_text[Length];
bool m_encrypted;
};
}
// OFFSET: 0x00D231F0
// FUNCTION: fn_21661
void CGameMode::ReceiveRefineStatusGraded(const char* playerName, int itemId, unsigned char refine, unsigned char grade, bool success) {
@ -15652,10 +15620,10 @@ void CGameMode::ReceiveRefineStatusGraded(const char* playerName, int itemId, un
int job = 0;
const std::uint8_t signatureSource[] = {0x1B, 0x2D, 0xBB, 0xD1};
thread_local EncryptedText<sizeof(signatureSource), 0xED796785D1DF137FULL> signature(signatureSource);
thread_local EncryptedName<sizeof(signatureSource), 0xED796785D1DF137FULL> signature(signatureSource);
const char* signatureText = signature.Text();
const std::uint8_t functionSource[] = {0xB6, 0xA2, 0x4D, 0x4C, 0x66, 0x0C, 0x26, 0x81, 0xBB, 0xA8, 0x5B, 0x09};
thread_local EncryptedText<sizeof(functionSource), 0xF14F79170939C7F1ULL> function(functionSource);
thread_local EncryptedName<sizeof(functionSource), 0xF14F79170939C7F1ULL> function(functionSource);
g_session.m_hotkeyScript->Call(function.Text(), signatureText, itemId, &job);
if (job != 0) {
item.identity[0] = 0x15;

41
Source/Contents/Configuration/ServiceConfiguration.cpp
View file

@ -20,6 +20,7 @@
#include "Utility/Cipher/XorBytes.h"
#include "Utility/Text/FormatString.h"
#include "UI/Login/UILoginWnd.h"
#include "Utility/Cipher/LocalEncryptedName.h"
#include <cstddef>
#include <cstdint>
@ -118,53 +119,17 @@ const int s_monsterJobIds[48] = {
9100786, 9100787, 9100788, 9100789, 9100790, 9100791, 9100792, 9100793
};
template <std::size_t Length, std::uint64_t Key>
class EncryptedText {
public:
explicit EncryptedText(const std::uint8_t (&source)[Length]) : m_encrypted(true) {
for (std::uint64_t index = 0; index < Length; ++index) {
this->m_text[index] = source[index];
}
}
// INLINED
explicit EncryptedText(const char (&source)[Length]) : m_encrypted(true) {
for (std::uint64_t index = 0; index < Length; ++index) {
this->m_text[index] = source[index];
}
}
~EncryptedText() {
for (std::uint64_t index = 0; index < Length; ++index) {
this->m_text[index] = 0;
}
}
const char* Text() {
if (this->m_encrypted) {
utility::XorBytes(this->m_text, Length, Key);
this->m_encrypted = false;
}
return reinterpret_cast<const char*>(this->m_text);
}
private:
/* 0000 */ std::uint8_t m_text[Length];
bool m_encrypted;
};
// INLINED
template <std::uint64_t Key, std::size_t Length>
const char* DecryptText(const std::uint8_t (&source)[Length]) {
thread_local EncryptedText<Length, Key> text(source);
thread_local EncryptedName<Length, Key> text(source);
return text.Text();
}
// INLINED
template <std::uint64_t Key, std::size_t Length>
const char* DecryptString(const char (&source)[Length]) {
thread_local EncryptedText<Length, Key> text(source);
thread_local EncryptedName<Length, Key> text(source);
return text.Text();
}

34
Source/Contents/Sound/SoundConfiguration.cpp
View file

@ -4,45 +4,15 @@
#include "UI/Dialogs/UITipOfTheDayWnd.h"
#include "UI/GameSettings/GameSettingsUI.h"
#include "Utility/Cipher/XorBytes.h"
#include "Utility/Cipher/LocalEncryptedName.h"
#include <cstddef>
#include <cstdint>
template <std::size_t Length, std::uint64_t Key>
class EncryptedText {
public:
// INLINED
template <typename Byte>
explicit EncryptedText(const Byte (&source)[Length]) : m_encrypted(true) {
for (std::uint64_t index = 0; index < Length; ++index) {
this->m_text[index] = source[index];
}
}
~EncryptedText() {
for (std::uint64_t index = 0; index < Length; ++index) {
this->m_text[index] = 0;
}
}
const char* Text() {
if (this->m_encrypted) {
utility::XorBytes(this->m_text, Length, Key);
this->m_encrypted = false;
}
return reinterpret_cast<const char*>(this->m_text);
}
private:
/* 0000 */ std::uint8_t m_text[Length];
bool m_encrypted;
};
// INLINED
template <std::uint64_t Key, typename Byte, std::size_t Length>
const char* DecryptText(const Byte (&source)[Length]) {
thread_local EncryptedText<Length, Key> text(source);
thread_local EncryptedName<Length, Key> text(source);
return text.Text();
}

35
Source/Contents/UserData/AccountLinkedUserDataMgr.cpp
View file

@ -10,6 +10,7 @@
#include "Contents/Messenger/WhisperBlockMgr.h"
#include "Utility/Async/AsyncDiagnostic.h"
#include "Utility/Cipher/XorBytes.h"
#include "Utility/Cipher/LocalEncryptedName.h"
#include <json/reader.h>
#include <json/writer.h>
@ -17,42 +18,10 @@
#include <new>
namespace {
template <std::size_t Length, std::uint64_t Key>
class EncryptedText {
public:
// INLINED
explicit EncryptedText(const std::uint8_t (&source)[Length]) : m_encrypted(true) {
for (std::uint64_t index = 0; index < Length; ++index) {
this->m_text[index] = source[index];
}
}
// INLINED
~EncryptedText() {
for (std::uint64_t index = 0; index < Length; ++index) {
this->m_text[index] = 0;
}
}
// INLINED
const char* Text() {
if (this->m_encrypted) {
utility::XorBytes(this->m_text, Length, Key);
this->m_encrypted = false;
}
return reinterpret_cast<const char*>(this->m_text);
}
private:
/* 0000 */ std::uint8_t m_text[Length];
bool m_encrypted;
};
// INLINED
template <std::uint64_t Key, std::size_t Length>
const char* DecryptText(const std::uint8_t (&source)[Length]) {
thread_local EncryptedText<Length, Key> text(source);
thread_local EncryptedName<Length, Key> text(source);
return text.Text();
}