From bc9dce517a24c0433cef40363cef4eba76fffd93 Mon Sep 17 00:00:00 2001 From: ragnarok-clanker Date: Thu, 12 Nov 2026 15:09:20 +0000 Subject: [PATCH] Decompile 4 functions in Source/Contents/UserData/AccountLinkedUserDataSaveAsyncWork.cpp Batch #18510 by ragnarok-clanker: 2 byte-identical, 2 confirmed by peer review. - fn_03480 CAccountLinkedUserDataSaveAsyncWork::Bind: logic confirmed by peer review - fn_03481 CAccountLinkedUserDataSaveAsyncWork::Reset: byte-identical (already on main) - fn_03482 CAccountLinkedUserDataSaveAsyncWork::Complete: byte-identical (already on main) - fn_03483 CAccountLinkedUserDataSaveAsyncWork::Execute: logic confirmed by peer review Peer-reviewed-by: eAthena, cremane Accepted without human review: peers confirmed the logic ("same" ahead by at least 3, with 70% of the votes). --- .../AccountLinkedUserDataSaveAsyncWork.cpp | 35 ++++++------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/Source/Contents/UserData/AccountLinkedUserDataSaveAsyncWork.cpp b/Source/Contents/UserData/AccountLinkedUserDataSaveAsyncWork.cpp index afebc56a9..57a3896e6 100644 --- a/Source/Contents/UserData/AccountLinkedUserDataSaveAsyncWork.cpp +++ b/Source/Contents/UserData/AccountLinkedUserDataSaveAsyncWork.cpp @@ -7,6 +7,7 @@ #include "Utility/Text/FormatString.h" #include "Utility/Cipher/LocalEncryptedName.h" #include "Utility/Cipher/CryptName.h" +#include "Utility/Cipher/Obfuscate.h" #include #include @@ -18,21 +19,16 @@ namespace { "untLinkedUserDataSaveAsyncWork.cpp"; // INLINED - template - const char* DecryptName(const std::uint8_t (&source)[Length]) { - thread_local EncryptedName name(source); - return name.Text(); } -} // GLOBAL: gl_25601 -const char* g_accountLinkedUserDataSavePoolName = DecryptName<0x1D6D75EDE7CD311FULL>(CRYPT_BYTES(27, "AccountLinkedUserData_Save", 0x1D6D75EDE7CD311FULL)); +const char* g_accountLinkedUserDataSavePoolName = OBFUSCATE_BYTES_TEXT("AccountLinkedUserData_Save", 0x1D6D75EDE7CD311FULL); // OFFSET: 0x005BDAA0 // FUNCTION: fn_03478 CAccountLinkedUserDataSaveAsyncWork::CAccountLinkedUserDataSaveAsyncWork() : NAsyncWork(g_accountLinkedUserDataSavePoolName), m_accountId(0), - m_diagnostic(false, std::string(DecryptName<0x59278F63D79F3DA1ULL>({0xD4, 0x53, 0xF4, 0xB9, 0x14, 0xE0, 0x49, 0x59})), sourceFile, 26) { + m_diagnostic(false, std::string(OBFUSCATE_BYTES_TEXT("unknwon", 0x59278F63D79F3DA1ULL)), sourceFile, 26) { } // INLINED @@ -53,9 +49,7 @@ void CAccountLinkedUserDataSaveAsyncWork::Bind(std::uint32_t accountId, std::str this->m_url = url; this->m_token = token; this->m_data = data; - constexpr std::array diagnosticSourceArray = CRYPT_NAME("unknwon", 0x812BE72BCD5707B7ULL); - const std::uint8_t (&diagnosticSource)[8] = diagnosticSourceArray._Elems; - this->m_diagnostic = AsyncDiagnostic(false, std::string(DecryptName<0x812BE72BCD5707B7ULL>(diagnosticSource)), sourceFile, 54); + this->m_diagnostic = AsyncDiagnostic(false, std::string(OBFUSCATE_BYTES_TEXT("unknwon", 0x812BE72BCD5707B7ULL)), sourceFile, 54); } // OFFSET: 0x005BE210 @@ -65,24 +59,15 @@ bool CAccountLinkedUserDataSaveAsyncWork::Execute() { StringFormat(accountId, sizeof(accountId), _TRUNCATE, "%lu", this->m_accountId); std::string name = CCURLMgr::GetInstance()->ToUtf8(this->m_accountName); CCURLPostHander handler(this->m_url); - constexpr std::array aidArray = CRYPT_NAME("AID", 0xC52FB5FBB94FF917ULL); - const std::uint8_t (&aid)[4] = aidArray._Elems; - handler.AddField(DecryptName<0xC52FB5FBB94FF917ULL>(aid), accountId, 4); - constexpr std::array tokenArray = CRYPT_NAME("AuthToken", 0x93E7A3A1F587CDC5ULL); - const std::uint8_t (&token)[10] = tokenArray._Elems; - handler.AddField(DecryptName<0x93E7A3A1F587CDC5ULL>(token), this->m_token, 4); - const std::uint8_t worldName[] = CRYPT_BYTES(10, "WorldName", 0x2FF3C5036D070127ULL); - handler.AddField(DecryptName<0x2FF3C5036D070127ULL>(worldName), name, 4); - const std::uint8_t data[] = CRYPT_BYTES(5, "data", 0x17359BF953C367B3ULL); - handler.AddField(DecryptName<0x17359BF953C367B3ULL>(data), this->m_data, 4); + handler.AddField(OBFUSCATE_BYTES_TEXT("AID", 0xC52FB5FBB94FF917ULL), accountId, 4); + handler.AddField(OBFUSCATE_BYTES_TEXT("AuthToken", 0x93E7A3A1F587CDC5ULL), this->m_token, 4); + handler.AddField(OBFUSCATE_BYTES_TEXT("WorldName", 0x2FF3C5036D070127ULL), name, 4); + handler.AddField(OBFUSCATE_BYTES_TEXT("data", 0x17359BF953C367B3ULL), this->m_data, 4); if (handler.Perform() != 0) { - constexpr std::array errorArray = CRYPT_NAME("fail", 0x91651D81F559F971ULL); - const std::uint8_t (&error)[5] = errorArray._Elems; - this->m_diagnostic = AsyncDiagnostic(false, std::string(DecryptName<0x91651D81F559F971ULL>(error)), sourceFile, 102); + this->m_diagnostic = AsyncDiagnostic(false, std::string(OBFUSCATE_BYTES_TEXT("fail", 0x91651D81F559F971ULL)), sourceFile, 102); } else { - const std::uint8_t good[] = CRYPT_BYTES(5, "good", 0x73D1674B61DF7B0BULL); - this->m_diagnostic = AsyncDiagnostic(true, std::string(DecryptName<0x73D1674B61DF7B0BULL>(good)), sourceFile, 106); + this->m_diagnostic = AsyncDiagnostic(true, std::string(OBFUSCATE_BYTES_TEXT("good", 0x73D1674B61DF7B0BULL)), sourceFile, 106); } return false;