From 144f799bbb67fc7a30ec140e7ae65fb47eb1299f Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 20 Oct 2020 19:11:02 -0400 Subject: [PATCH] ARDecrypt: Resolve seedtable at compile-time We can boot the formation of the table off to the compiler at compile-time, rather than building the table at run-time. --- Source/Core/Core/ARDecrypt.cpp | 127 ++++++++++++++++----------------- 1 file changed, 61 insertions(+), 66 deletions(-) diff --git a/Source/Core/Core/ARDecrypt.cpp b/Source/Core/Core/ARDecrypt.cpp index af4cad929d..c321381778 100644 --- a/Source/Core/Core/ARDecrypt.cpp +++ b/Source/Core/Core/ARDecrypt.cpp @@ -9,6 +9,7 @@ #include "Core/ARDecrypt.h" #include +#include #include #include #include @@ -25,42 +26,40 @@ namespace ActionReplay { // Alphanumeric filter for text<->bin conversion -static const char* filter = "0123456789ABCDEFGHJKMNPQRTUVWXYZILOS"; +constexpr char filter[] = "0123456789ABCDEFGHJKMNPQRTUVWXYZILOS"; -static u32 genseeds[0x20]; - -static const u8 gentable0[0x38] = { +constexpr std::array gentable0{ 0x39, 0x31, 0x29, 0x21, 0x19, 0x11, 0x09, 0x01, 0x3A, 0x32, 0x2A, 0x22, 0x1A, 0x12, 0x0A, 0x02, 0x3B, 0x33, 0x2B, 0x23, 0x1B, 0x13, 0x0B, 0x03, 0x3C, 0x34, 0x2C, 0x24, 0x3F, 0x37, 0x2F, 0x27, 0x1F, 0x17, 0x0F, 0x07, 0x3E, 0x36, 0x2E, 0x26, 0x1E, 0x16, 0x0E, 0x06, 0x3D, 0x35, 0x2D, 0x25, 0x1D, 0x15, 0x0D, 0x05, 0x1C, 0x14, 0x0C, 0x04, }; -static const u8 gentable1[0x08] = { +constexpr std::array gentable1{ 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, }; -static const u8 gentable2[0x10] = { +constexpr std::array gentable2{ 0x01, 0x02, 0x04, 0x06, 0x08, 0x0A, 0x0C, 0x0E, 0x0F, 0x11, 0x13, 0x15, 0x17, 0x19, 0x1B, 0x1C, }; -static const u8 gentable3[0x30] = { +constexpr std::array gentable3{ 0x0E, 0x11, 0x0B, 0x18, 0x01, 0x05, 0x03, 0x1C, 0x0F, 0x06, 0x15, 0x0A, 0x17, 0x13, 0x0C, 0x04, 0x1A, 0x08, 0x10, 0x07, 0x1B, 0x14, 0x0D, 0x02, 0x29, 0x34, 0x1F, 0x25, 0x2F, 0x37, 0x1E, 0x28, 0x33, 0x2D, 0x21, 0x30, 0x2C, 0x31, 0x27, 0x38, 0x22, 0x35, 0x2E, 0x2A, 0x32, 0x24, 0x1D, 0x20, }; -static const u16 crctable0[0x10] = { +constexpr std::array crctable0{ 0x0000, 0x1081, 0x2102, 0x3183, 0x4204, 0x5285, 0x6306, 0x7387, 0x8408, 0x9489, 0xA50A, 0xB58B, 0xC60C, 0xD68D, 0xE70E, 0xF78F, }; -static const u16 crctable1[0x10] = { +constexpr std::array crctable1{ 0x0000, 0x1189, 0x2312, 0x329B, 0x4624, 0x57AD, 0x6536, 0x74BF, 0x8C48, 0x9DC1, 0xAF5A, 0xBED3, 0xCA6C, 0xDBE5, 0xE97E, 0xF8F7, }; -static const u8 gensubtable[0x08] = { +constexpr std::array gensubtable{ 0x34, 0x1C, 0x84, 0x9E, 0xFD, 0xA4, 0xB6, 0x7B, }; -static const u32 table0[0x40] = { +constexpr std::array table0{ 0x01010400, 0x00000000, 0x00010000, 0x01010404, 0x01010004, 0x00010404, 0x00000004, 0x00010000, 0x00000400, 0x01010400, 0x01010404, 0x00000400, 0x01000404, 0x01010004, 0x01000000, 0x00000004, 0x00000404, 0x01000400, 0x01000400, 0x00010400, 0x00010400, 0x01010000, 0x01010000, 0x01000404, @@ -70,7 +69,7 @@ static const u32 table0[0x40] = { 0x01010404, 0x00010004, 0x01010000, 0x01000404, 0x01000004, 0x00000404, 0x00010404, 0x01010400, 0x00000404, 0x01000400, 0x01000400, 0x00000000, 0x00010004, 0x00010400, 0x00000000, 0x01010004, }; -static const u32 table1[0x40] = { +constexpr std::array table1{ 0x80108020, 0x80008000, 0x00008000, 0x00108020, 0x00100000, 0x00000020, 0x80100020, 0x80008020, 0x80000020, 0x80108020, 0x80108000, 0x80000000, 0x80008000, 0x00100000, 0x00000020, 0x80100020, 0x00108000, 0x00100020, 0x80008020, 0x00000000, 0x80000000, 0x00008000, 0x00108020, 0x80100000, @@ -80,7 +79,7 @@ static const u32 table1[0x40] = { 0x00008020, 0x80108000, 0x00100000, 0x80000020, 0x00100020, 0x80008020, 0x80000020, 0x00100020, 0x00108000, 0x00000000, 0x80008000, 0x00008020, 0x80000000, 0x80100020, 0x80108020, 0x00108000, }; -static const u32 table2[0x40] = { +constexpr std::array table2{ 0x00000208, 0x08020200, 0x00000000, 0x08020008, 0x08000200, 0x00000000, 0x00020208, 0x08000200, 0x00020008, 0x08000008, 0x08000008, 0x00020000, 0x08020208, 0x00020008, 0x08020000, 0x00000208, 0x08000000, 0x00000008, 0x08020200, 0x00000200, 0x00020200, 0x08020000, 0x08020008, 0x00020208, @@ -90,7 +89,7 @@ static const u32 table2[0x40] = { 0x08000208, 0x00020000, 0x08000000, 0x08020208, 0x00000008, 0x00020208, 0x00020200, 0x08000008, 0x08020000, 0x08000208, 0x00000208, 0x08020000, 0x00020208, 0x00000008, 0x08020008, 0x00020200, }; -static const u32 table3[0x40] = { +constexpr std::array table3{ 0x00802001, 0x00002081, 0x00002081, 0x00000080, 0x00802080, 0x00800081, 0x00800001, 0x00002001, 0x00000000, 0x00802000, 0x00802000, 0x00802081, 0x00000081, 0x00000000, 0x00800080, 0x00800001, 0x00000001, 0x00002000, 0x00800000, 0x00802001, 0x00000080, 0x00800000, 0x00002001, 0x00002080, @@ -100,7 +99,7 @@ static const u32 table3[0x40] = { 0x00802081, 0x00000081, 0x00000001, 0x00002000, 0x00800001, 0x00002001, 0x00802080, 0x00800081, 0x00002001, 0x00002080, 0x00800000, 0x00802001, 0x00000080, 0x00800000, 0x00002000, 0x00802080, }; -static const u32 table4[0x40] = { +constexpr std::array table4{ 0x00000100, 0x02080100, 0x02080000, 0x42000100, 0x00080000, 0x00000100, 0x40000000, 0x02080000, 0x40080100, 0x00080000, 0x02000100, 0x40080100, 0x42000100, 0x42080000, 0x00080100, 0x40000000, 0x02000000, 0x40080000, 0x40080000, 0x00000000, 0x40000100, 0x42080100, 0x42080100, 0x02000100, @@ -110,7 +109,7 @@ static const u32 table4[0x40] = { 0x42080100, 0x00080100, 0x42000000, 0x42080100, 0x02080000, 0x00000000, 0x40080000, 0x42000000, 0x00080100, 0x02000100, 0x40000100, 0x00080000, 0x00000000, 0x40080000, 0x02080100, 0x40000100, }; -static const u32 table5[0x40] = { +constexpr std::array table5{ 0x20000010, 0x20400000, 0x00004000, 0x20404010, 0x20400000, 0x00000010, 0x20404010, 0x00400000, 0x20004000, 0x00404010, 0x00400000, 0x20000010, 0x00400010, 0x20004000, 0x20000000, 0x00004010, 0x00000000, 0x00400010, 0x20004010, 0x00004000, 0x00404000, 0x20004010, 0x00000010, 0x20400010, @@ -120,7 +119,7 @@ static const u32 table5[0x40] = { 0x00404010, 0x20404000, 0x00000000, 0x20400010, 0x00000010, 0x00004000, 0x20400000, 0x00404010, 0x00004000, 0x00400010, 0x20004010, 0x00000000, 0x20404000, 0x20000000, 0x00400010, 0x20004010, }; -static const u32 table6[0x40] = { +constexpr std::array table6{ 0x00200000, 0x04200002, 0x04000802, 0x00000000, 0x00000800, 0x04000802, 0x00200802, 0x04200800, 0x04200802, 0x00200000, 0x00000000, 0x04000002, 0x00000002, 0x04000000, 0x04200002, 0x00000802, 0x04000800, 0x00200802, 0x00200002, 0x04000800, 0x04000002, 0x04200000, 0x04200800, 0x00200002, @@ -130,7 +129,7 @@ static const u32 table6[0x40] = { 0x00000802, 0x04000002, 0x04200802, 0x04200000, 0x00200800, 0x00000000, 0x00000002, 0x04200802, 0x00000000, 0x00200802, 0x04200000, 0x00000800, 0x04000002, 0x04000800, 0x00000800, 0x00200002, }; -static const u32 table7[0x40] = { +constexpr std::array table7{ 0x10001040, 0x00001000, 0x00040000, 0x10041040, 0x10000000, 0x10001040, 0x00000040, 0x10000000, 0x00040040, 0x10040000, 0x10041040, 0x00041000, 0x10041000, 0x00041040, 0x00001000, 0x00000040, 0x10040000, 0x10000040, 0x10001000, 0x00001040, 0x00041000, 0x00040040, 0x10040040, 0x10041000, @@ -141,26 +140,30 @@ static const u32 table7[0x40] = { 0x10041040, 0x00041000, 0x00041000, 0x00001040, 0x00001040, 0x00040040, 0x10000000, 0x10041000, }; -static void generateseeds(u32* seeds, const u8* seedtable, u8 doreverse) -{ - u32 tmp3; - u8 array0[0x38], array1[0x38], array2[0x08]; - u8 tmp, tmp2; +using Seeds = std::array; - for (int i = 0; i < 0x38; ++i) +constexpr Seeds genseeds = [] { + std::array array0{}; + std::array array1{}; + std::array array2{}; + Seeds seeds{}; + + for (size_t i = 0; i < array0.size(); ++i) { - tmp = (gentable0[i] - 1); - array0[i] = ((u32)(0 - (seedtable[tmp >> 3] & gentable1[tmp & 7])) >> 31); + const auto tmp = u8(gentable0[i] - 1); + array0[i] = (u32(0 - (gensubtable[tmp >> 3] & gentable1[tmp & 7])) >> 31); } for (int i = 0; i < 0x10; ++i) { - memset(array2, 0, 8); - tmp2 = gentable2[i]; + for (u32 j = 0; j < 8; j++) + array2[j] = 0; - for (int j = 0; j < 0x38; j++) + const u8 tmp2 = gentable2[i]; + + for (u32 j = 0; j < 0x38; j++) { - tmp = (tmp2 + j); + auto tmp = u8(tmp2 + j); if (j > 0x1B) { @@ -176,40 +179,35 @@ static void generateseeds(u32* seeds, const u8* seedtable, u8 doreverse) array1[j] = array0[tmp]; } - for (int j = 0; j < 0x30; j++) + for (u32 j = 0; j < 0x30; j++) { - if (!array1[gentable3[j] - 1]) + if (array1[gentable3[j] - 1] == 0) { continue; } - tmp = (((j * 0x2AAB) >> 16) - (j >> 0x1F)); + + const u8 tmp = (((j * 0x2AAB) >> 16) - (j >> 0x1F)); array2[tmp] |= (gentable1[j - (tmp * 6)] >> 2); } seeds[i << 1] = ((array2[0] << 24) | (array2[2] << 16) | (array2[4] << 8) | array2[6]); seeds[(i << 1) + 1] = ((array2[1] << 24) | (array2[3] << 16) | (array2[5] << 8) | array2[7]); } - if (!doreverse) + int j = 0x1F; + for (int i = 0; i < 16; i += 2) { - int j = 0x1F; - for (int i = 0; i < 16; i += 2) - { - tmp3 = seeds[i]; - seeds[i] = seeds[j - 1]; - seeds[j - 1] = tmp3; + u32 tmp3 = seeds[i]; + seeds[i] = seeds[j - 1]; + seeds[j - 1] = tmp3; - tmp3 = seeds[i + 1]; - seeds[i + 1] = seeds[j]; - seeds[j] = tmp3; - j -= 2; - } + tmp3 = seeds[i + 1]; + seeds[i + 1] = seeds[j]; + seeds[j] = tmp3; + j -= 2; } -} -static void buildseeds() -{ - generateseeds(genseeds, gensubtable, 0); -} + return seeds; +}(); static void getcode(const u32* src, u32* addr, u32* val) { @@ -352,17 +350,18 @@ static bool getbitstring(u32* ctrl, u32* out, u8 len) static bool batchdecrypt(u32* codes, u16 size) { - u32 tmp, *ptr = codes; - u32 tmparray[4] = {0}, tmparray2[8] = {0}; + u32* ptr = codes; + std::array tmparray{}; + std::array tmparray2{}; // Not required // if (size & 1) return 0; // if (!size) return 0; - tmp = (size >> 1); + u32 tmp = (size >> 1); while (tmp--) { - decryptcode(genseeds, ptr); + decryptcode(genseeds.data(), ptr); ptr += 2; } @@ -370,11 +369,11 @@ static bool batchdecrypt(u32* codes, u16 size) tmparray[1] = 0; tmparray[2] = 4; // Skip crc tmparray[3] = size; - getbitstring(tmparray, tmparray2 + 1, 11); // Game id - getbitstring(tmparray, tmparray2 + 2, 17); // Code id - getbitstring(tmparray, tmparray2 + 3, 1); // Master code - getbitstring(tmparray, tmparray2 + 4, 1); // Unknown - getbitstring(tmparray, tmparray2 + 5, 2); // Region + getbitstring(tmparray.data(), &tmparray2[1], 11); // Game id + getbitstring(tmparray.data(), &tmparray2[2], 17); // Code id + getbitstring(tmparray.data(), &tmparray2[3], 1); // Master code + getbitstring(tmparray.data(), &tmparray2[4], 1); // Unknown + getbitstring(tmparray.data(), &tmparray2[5], 2); // Region // Grab gameid and region from the last decrypted code // TODO: Maybe check this against Dolphin's GameID? - "code is for wrong game" type msg @@ -460,25 +459,21 @@ static int alphatobin(u32* dst, const std::vector& alpha, int size) void DecryptARCode(std::vector vCodes, std::vector* ops) { - // The almighty buildseeds() function!! without this, the crypto routines are useless - buildseeds(); - - u32 uCodes[1200]; - u32 ret; + std::array uCodes; for (std::string& s : vCodes) { std::transform(s.begin(), s.end(), s.begin(), toupper); } - ret = alphatobin(uCodes, vCodes, (int)vCodes.size()); + const u32 ret = alphatobin(uCodes.data(), vCodes, (int)vCodes.size()); if (ret) { // Return value is index + 1, 0 being the success flag value. PanicAlertT("Action Replay Code Decryption Error:\nParity Check Failed\n\nCulprit Code:\n%s", vCodes[ret - 1].c_str()); } - else if (!batchdecrypt(uCodes, (u16)vCodes.size() << 1)) + else if (!batchdecrypt(uCodes.data(), (u16)vCodes.size() << 1)) { // Commented out since we just send the code anyways and hope for the best XD // PanicAlert("Action Replay Code Decryption Error:\nCRC Check Failed\n\n"