4.7 Update (v1.3.2.0) (#16)

fadillzzz · web-flow · commit 5bd2973e14f3 · 2024-06-13T16:15:18.000Z
* wip

* peepoClap
diff --git a/license_gen.js b/license_gen.js
@@ -1,62 +1,84 @@
-const crypto = require('crypto');
-const fs = require('node:fs');
-const readline = require('node:readline');
-const { stdin: input, stdout: output } = require('node:process');
+const crypto = require("crypto");
+const fs = require("node:fs");
+const readline = require("node:readline");
+const { stdin: input, stdout: output } = require("node:process");
 const rl = readline.createInterface({ input, output });
 rl.question("Enter your HWID: ", (user_input) => {
-    hwid = user_input;
+  //   hwid = user_input;
+  hwid = "---------Hi-Korepi-Devs---------";
 
-    const publicKey = `-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0SxoW83nU4qAbHXqjhal
-MiU62ae79Ayv/EAmVfJEeCymJIpvtTqoPr99MBMDMHPxqqW1TgapD0bdAoU0vBpx
-G5INKIQnVi1ZE0YPP1GKUXN4nchM31a9NqG4mdWXtpD/jTt40Tpxn/zaj/5kDCuP
-o+iKQqwzKnE27Fyi0USLK82PfwCN0KlA4hmHUgB0UD+eG3VSlfHuU4ZITKqwEZFy
-wREoekljDot8noMOQiBo0NgqmkLLK2WQ2TaTSm3A/E6d7FI+HrdPdl/GmMdTF1tf
-lr1yMFQ1eAdOJqnmM5YxCv4FsU2qpZFFXNEbnjJ+mx549LMUWBUeRjOwZ8zXUWxd
-oQIDAQAB
+  const publicKey = `-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuBti5eEFCv3+qcBnooMF
+vNHH2lDD/GjcgNpQNaeow7bCawpHMkyxtUUVQjuhyo5+LT7lMOJ+yoQAE5507Cvn
+Ep9tuSJC0qcVT4/07FLblTDJiYxFgsFd5/skmUDTmClgffr8UOPRvJp/q62GTyYa
+Pb63jWPHbNhqVjjWCI/ZRnfzqkadiP9uzdTVvyLkLpj6Hr/LpvHRUlK/NGhh1QU7
+8lIc87XmNzOVL+uzMAT00AcKzilwg0za/oG5SXeHdac53t0lN3Bge5VxVgyzh0M2
+/ADipBfd2JzlElNUL0y45Kx/HopT3nfwoq5PHW3JFXLxg56l3U8LqedK7Q+K7jmP
+/QIDAQAB
 -----END PUBLIC KEY-----`;
-    const privateKey = `-----BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEA0SxoW83nU4qAbHXqjhalMiU62ae79Ayv/EAmVfJEeCymJIpv
-tTqoPr99MBMDMHPxqqW1TgapD0bdAoU0vBpxG5INKIQnVi1ZE0YPP1GKUXN4nchM
-31a9NqG4mdWXtpD/jTt40Tpxn/zaj/5kDCuPo+iKQqwzKnE27Fyi0USLK82PfwCN
-0KlA4hmHUgB0UD+eG3VSlfHuU4ZITKqwEZFywREoekljDot8noMOQiBo0NgqmkLL
-K2WQ2TaTSm3A/E6d7FI+HrdPdl/GmMdTF1tflr1yMFQ1eAdOJqnmM5YxCv4FsU2q
-pZFFXNEbnjJ+mx549LMUWBUeRjOwZ8zXUWxdoQIDAQABAoIBAD65522oWHd38D0W
-O0lyxwU7nuNIZpev+lJV1mktppS3JveMQCWDupJekCcLfIhaLJ105eLJIod/Q6WO
-1pqV/1c6PBHrV3SDUtPxzX66cBUu4HvIZi0PcNxiMN6I698Gqmvq6rcrpIlKpSxL
-KCtyILgRcuy9gPZ4TvUgbn785BM1Hby1LwNLPs9fhyl6QZZq4eTgyH5iGNIoDlhf
-DZkyj2WbqQ9tsVS/lFPV9B0eexfTLsEYT179vTyUEwJLgcteAu7c8asC+1XU3Mer
-HbXedC0vytNoGBCo1dg4QYeSgN6DKbhhLqrQY9ibR1LZv91j5fskUIiqQf3wgANs
-TilkB/ECgYEA7eLKFAXbyxs1BRV0mUcu0f1DlQJGJGZoyWMe9RMxMNwaM3PcmkAa
-dWE8nmLvLoMz8+5sw7BQ0ZVxgfDVVld0MnwnsJOMlLbPj3oBz0SLbZbNFrIX6jrt
-K2hcjVFn/YFssYAzGtUWB9TtOFdn38K5Pj0vfDOnSIj1ngNRC4WvaRUCgYEA4Rnq
-LE6sqMQCbChJEgkSkJedJem2jwGep7Dt/GgvJEIPjfZT+RaKpkFf6qDAPMmKi3eF
-1chc5SqPeJ2E7bM/3L1szytQKWTBqsVqHpyVOTe0IAAybVS4Mx3ICtjTzuKgRERY
-LJUVBEgWU0xnnRJqlAXIjuTkE47dDgehTafwrV0CgYBsm2tJQvd7Pluxi38lb9NX
-efq98EDX442ZzFBY8b82oHax4QbpwbSSvKcxZNfwc2RnzQYJPdlYJpOhELRF7D2X
-wwlX27WGPAR9a+WhnJjPmtbdsseqX+biN45x0qXYnptiWrZ6XKjnQHZhj75T8ZIj
-cUnZubd5LVZ+IuOAkDNqlQKBgH77SXiZIRlLCTrONvovmANtI79BajSd60wZqQbc
-FsvTYEbrEE/RgYFsG5mV+RvRbZBjamJA1vaH3ctiwJv+pCX3zavIeT4AkqetGcIO
-/rb6T2hF9CxswERFppVH36Qzf8lC7KKpruNtbvqqfUDEJM8/u/Wv9WF7FARYFYxj
-EogZAoGBAMNI6WOB/u4vm5QpJVW+p33xyJJTmVTmzCFXCRsOvC0gDwBZcKGe4BIR
-E7CyLasw3HG9IhZYOi/KoX+UQrcAOcRPAsJmlqiQxu2qskX81AiOkhPEBprVRhj3
-VqquzXQuHpi/UwwiVoBX0Qi1/bWI1t5krlF4Me17cT6hffD0N/Qr
------END RSA PRIVATE KEY-----`;
+  const privateKey = `-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC4G2Ll4QUK/f6p
+wGeigwW80cfaUMP8aNyA2lA1p6jDtsJrCkcyTLG1RRVCO6HKjn4tPuUw4n7KhAAT
+nnTsK+cSn225IkLSpxVPj/TsUtuVMMmJjEWCwV3n+ySZQNOYKWB9+vxQ49G8mn+r
+rYZPJho9vreNY8ds2GpWONYIj9lGd/OqRp2I/27N1NW/IuQumPoev8um8dFSUr80
+aGHVBTvyUhzzteY3M5Uv67MwBPTQBwrOKXCDTNr+gblJd4d1pzne3SU3cGB7lXFW
+DLOHQzb8AOKkF93YnOUSU1QvTLjkrH8eilPed/Cirk8dbckVcvGDnqXdTwup50rt
+D4ruOY/9AgMBAAECggEAAtZZNdW78Clt7UvLzRNb2UcaX2DzREaRb2Lt7YXB8hI0
++NVVt467BmIkK7sjiS2dADGB8rjq31AdeC/u+VzL2NugI0RF510v1OQREDtOqwPv
+dzE0OQml2tdh/wKiwCuTEx31GYIJT3DKGuk3sqyRpvXzejhZcHH9YYrKsaMV5CIa
+bDGikaoqEBCSXHT8SL2bOgf2tTX1szwR/Yn8GQDEgHwPlw3B41jSgOvUf9L52VZy
+ih5QxzQPzoT7DhMZ+LzPEAbvb80dMbT0TXVXLAYyrc+UOyw1Brtx1HSCTJ9K0naQ
+bazm0mq//6nokJagtwUC9Zt8HlyZmE0Q+Cb2diuT+QKBgQDZbKljoDDUPYLXbpnw
+rx76p58h0M5i7UTjodadIfXPDxZNP40poHUGQ0QNrned6JB7HSYe6hxLqV14AO6A
+EaVlmQLbHJvhk+/3sohjBgYiLX1GngAB9yeId7cHgpgmFKoX47E9ZF2zqWzcnMSU
+/kuhQBVPO8vQbecEmbj7SwJpiwKBgQDYxXT8PckYuz+izmtcgISm2CgUgExDAL1z
+wDMQfRs10ly+L4I5hVQkBu5BunYaf/lhatb9EBsDRbvvZmePSfSzHEjvrzidnpxZ
+FzABE+a5jpNQTPPQ/z98Dx5jtOt2fIV46Wbm/4ikyiJ3cioj9UIvqdLprgD2EDzI
+zghWkvvNlwKBgQCztBsA68rP8RMuqgx0INmzBE4DbgjXPRJ+Lioq74GyJN8i887h
+w+xVQ82AnV3iVvDrwLjcPlUquA43/FUj5vHUWjZBEZFJTbO9/4K4jacOIpjzf+2z
+siqroX7WpzrH5rZ7TkcU3dqQfw0p/iyAlPm/ii7SsTKQz/VsGP4KPQH+ZwKBgEtO
+zgWTsXlWFBWLgODyBSOxlLsKl3PvneHIs/TWgc2A95dbCfLRzxl1DvDmxoEOVKTz
+aR0hq0DHyTKycOfm2YwgF3ateQ3JPKf21kaJk26Dicor8ch55KRE3FnnUKYpPHV1
+ILq/q8kUMEUu9FTpr8S/SvbD7LGPko5whZUOG0yhAoGAK4VieEUXlxQeaI2JNQE+
+loHWRKnvVCnFUs7qsalQB5yvs/3kr7n9usgGhAtC0IpIwyp1D7v2Om+AjAZLbvXi
+EO6b4mHx2yTVODNwlDr1l5yvP20gqTDLIZb/fcIRxvnZKmEn0st7d7+5/NVUsGYv
+JuXe/NYkDOj7sJowggbhASU=
+-----END PRIVATE KEY-----`;
 
+  //   const randomBytes = crypto.randomBytes(10);
+  const randomBytes = Buffer.from("mokPVuACUwR5Qw==", "base64");
+  const md5 = crypto.createHash("md5").update(randomBytes).digest("hex");
+  const encryptedMd5 = Buffer.from(randomBytes).toString("base64");
 
-    const randomBytes = crypto.randomBytes(10);
-    const md5 = crypto.createHash('md5').update(randomBytes).digest('hex');
-    const encryptedMd5 = Buffer.from(randomBytes).toString('base64');
+  const cipher = crypto.createCipheriv(
+    "aes-256-cbc",
+    md5,
+    Buffer.from("6BCDEF0123456786")
+  );
+  let privatekeyPkcs1PemEnc = cipher.update(privateKey, "utf8", "base64");
+  privatekeyPkcs1PemEnc += cipher.final("base64");
 
-    const cipher = crypto.createCipheriv('aes-256-cbc', md5, Buffer.from('ABCDEF0123456789'));
-    let privatekeyPkcs1PemEnc = cipher.update(privateKey, 'utf8', 'base64');
-    privatekeyPkcs1PemEnc += cipher.final('base64');
+  const license = {
+    cardstr: "micah-oc-00000000000000000000000000000000",
+    expiry_time: Math.floor((Math.pow(2, 32) - 1) / 2),
+    hwid: hwid,
+    role: 25,
+    data_id: 44262,
+    user_id: Math.floor(Math.random() * 100000),
+  };
+  const encryptedLicense = crypto
+    .publicEncrypt(
+      { key: publicKey, padding: crypto.constants.RSA_PKCS1_PADDING },
+      JSON.stringify(license)
+    )
+    .toString("base64");
+  const packedLicense = JSON.stringify({
+    "encrypted.dat": encryptedLicense,
+    "Encrypted.md5": encryptedMd5,
+    "privatekey_pkcs1.pem.enc": privatekeyPkcs1PemEnc,
+  });
 
-    const license = { "cardstr": "free-korepi", "expiry_time": Math.floor((Math.pow(2, 32) - 1) / 2), "hwid": hwid, "role": 25, "data_id": Math.floor(Math.random() * 100000), "user_id": Math.floor(Math.random() * 100000) };
-    const encryptedLicense = crypto.publicEncrypt({ key: publicKey, padding: crypto.constants.RSA_PKCS1_PADDING }, JSON.stringify(license)).toString('base64');
-    const packedLicense = JSON.stringify({ "encrypted.dat": encryptedLicense, "Encrypted.md5": encryptedMd5, "privatekey_pkcs1.pem.enc": privatekeyPkcs1PemEnc });
+  fs.writeFileSync("enc.json", packedLicense);
 
-    fs.writeFileSync('enc.json', packedLicense);
-
-    rl.close();
+  rl.close();
 });
diff --git a/lol/dll.cpp b/lol/dll.cpp
@@ -6,28 +6,6 @@
 #include <format>
 #include <iostream>
 
-typedef size_t (*copy_t)(void *, const char *);
-copy_t oCopy = nullptr;
-const auto *pubKey = "-----BEGIN PUBLIC KEY-----\n"
-                     "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0SxoW83nU4qAbHXqjhal\n"
-                     "MiU62ae79Ayv/EAmVfJEeCymJIpvtTqoPr99MBMDMHPxqqW1TgapD0bdAoU0vBpx\n"
-                     "G5INKIQnVi1ZE0YPP1GKUXN4nchM31a9NqG4mdWXtpD/jTt40Tpxn/zaj/5kDCuP\n"
-                     "o+iKQqwzKnE27Fyi0USLK82PfwCN0KlA4hmHUgB0UD+eG3VSlfHuU4ZITKqwEZFy\n"
-                     "wREoekljDot8noMOQiBo0NgqmkLLK2WQ2TaTSm3A/E6d7FI+HrdPdl/GmMdTF1tf\n"
-                     "lr1yMFQ1eAdOJqnmM5YxCv4FsU2qpZFFXNEbnjJ+mx549LMUWBUeRjOwZ8zXUWxd\n"
-                     "oQIDAQAB\n"
-                     "-----END PUBLIC KEY-----";
-bool replacedPubKey = false;
-
-size_t copy(void *a1, const char *a2) {
-    if (memcmp(a2, "-----BEGIN PUBLIC KEY-----", 26) == 0 && replacedPubKey == false) {
-        replacedPubKey = true;
-        a2 = pubKey;
-    }
-
-    return oCopy(a1, a2);
-}
-
 bool fakeResp = false;
 
 typedef void (*options_t)(void *, size_t, void *);
@@ -46,63 +24,8 @@ void options(void *a1, size_t a2, void *a3) {
 typedef size_t (*respHandler_t)(void *, char *, size_t, uint64_t *, uint32_t *a5);
 respHandler_t oRespHandler = nullptr;
 
-const auto versionInfoResp = R"|({
-    "msg": "success",
-    "code": 200,
-    "data": {
-        "announcement": "4.6 os&cn",
-        "latest_version": "1.3.1.3",
-        "update_required": true,
-        "update_url": "https://github.com/Cotton-Buds/calculator/releases",
-        "updated_at": "2024-05-16 03:21",
-        "updated_by": "Strigger(main) & Micah(auth) & EtoShinya(tech)",
-        "update_diff": {
-            "added_features": [
-                "fix all 409",
-                "Fix camera issues"
-            ],
-            "deleted_features": [
-                "修复所有失效功能",
-                "Restore all malfunctioning features."
-            ],
-            "total_size": "78.0 MB"
-        },
-        "compatible_versions": [
-            "none"
-        ]
-    },
-    "sign2": "LQuoFI+EQmj+ET67geipuHkfY0OlqPjefO4JftDJEIGZbKhV66kl8RGB4ANTHARYjmCo9OokSqTzkRJMVFyb2hM/ichoegIDsuEFtTlkR3uBmZUI43kyOHOfIEh3EWOY689RXKDGpjd20EIHDQUw7dRiAwUah9HjZG/hit1gM71d0Eqd2juhP2lMsvMn2R/F3xemK+DfOLvddzhosZyRF3p2oDlgWS7y821qbch1aMBNMFqajCHc/C3sxgkIEglHajep4+UhOhxHpeDHEhn+OX33ULVNu/+6S0FVi8J39L/xua/ACfA57KfWdSidwAZYU5rtB/sM6piXhbNUGK2wdA=="
-})|";
-const auto versionInfoChunkLength = std::format("{:x}", strlen(versionInfoResp));
-const auto versionInfoFirstChunk = std::format("{}\r\n{}\r\n", versionInfoChunkLength, versionInfoResp);
-const auto versionInfoSecondChunk = std::format("0\r\n\r\n");
-const auto versionInfoAggregated = versionInfoFirstChunk + versionInfoSecondChunk;
-
-const auto resp = R"({
-    "msg": "Hi there",
-    "code": 200,
-    "data": {
-        "createBy": null,
-        "createTime": "2024-05-25T14:06:09.662Z",
-        "updateBy": "anonymousUser",
-        "updateTime": "2024-05-25T14:06:09.662Z",
-        "delFlag": 0,
-        "remark": "Oops!",
-        "id": 44262,
-        "roleValue": 25,
-        "cardKey": null,
-        "expiryTime": "2038-01-19T03:14:07.000Z",
-        "lastLoginTime": "2024-05-25T14:06:09.662Z",
-        "hwid": "---------Hi-Korepi-Devs---------",
-        "fileMd5": "mokPVuACUwR5Qw==",
-        "resetTime": null,
-        "resetNum": 4,
-        "pauseTime": null,
-        "status": 0
-    },
-    "signature": "a5879201e7fb4e3064390fccb0d8bbcf628c70bb237843101f314710ebfa0adc",
-    "sign2": "coUVZrl9x43Dql30LoOOpp/U7+gVb7298CeYu6uu8gT1RRxsf4jvyz/xQckiDWd5Sj43dl5AAzdmJGPPFtyQC3haU20H6v09C6whJqSwHDuizT+SW7VFZbWT3jhc+y1bgkYEhbyxHK9hkTGF8hlMk6HSkhAg1vl8t/E7ZcScmh22ZRYXMRijZEEPCgNbDTXDwySqdRnEaLc17z4uvGG/+B2C/60T4aH4VFnFjDyCuIlxCOgMOUM3QcXj0KZakmHxddURpAULfBi00LCamJlJIeUFbnlg3vcrNoCxD/jpHmdZn0jr30jXpgljhAb5AxsX1xwdF5wYROiJTWv6U6nm0A=="
-})";
+const auto resp =
+    R"({"msg": "vpJSftgQ2noDAZR3Iri/ForvdhDZvxwlJCXowV9TgKSs+BoMyBMOIuxjpDcMTSov1thaXhg/d9aAKcpxOP6glQ3bSd8bHIGMku3Ck/33VdYhtzx4HwC4Lel5mVGZ9+2jffsIgHyIwxMl+8kYwh/QGQRlkC8zFfyNaMszsZiOxIJCy/RMYfI3buvCDPH/4D1/VxysPnaX+QtrVrs7Bt74byqnd38bi0GhpllEWL7CO+7fI+vMe2OSv6s0CUaOqzhDC5N8wIkHsthyVyP+GYoltTov3Bu5iaxmgZc/eYQPTkTWQ759pIVNjKJwnQI3EtOEdrRog6LAkA/CMGwMwBkScvY508Z3KhnNqqIIF9RpYLI6rdST+o2t5gIK4sElQg/2wHZT6wSm23t7YdxnwzEFZysv/H0y63iI4NMUmyZIkRvCyxlWVMpTt/rV9qubdbCjGDxG7A/0LbxCJBfBgEWu4Krpp1S+hk4qgIB+2apCh5sxU76mLzQdFLzNrgmbQADapyDO6rWw777F9FKlo/r9II8kISi/+2FxXp7TZE3ALbcyUo7zKucahsq7u9ucENm64D3PKV4YZCHchQY7xyYI4DaC1PQzleJxGaGbCoBQ0PZK7f33d3N3qB10OaEfe2de4uTcOKbVAjtjSLrlZcMGiZd40Bho76xCtcgAKG2FDxbH/PJo4BoIYwqiDzqpmxXBOsn0JqKLGLaAyU840GAgyLO62lE7/A26w+B9q7hkOIcKlfXZpdwjsll/dADe2U/uF5nrLxEOUGDx9gbUoB95KLD1S3KCCyaLuv8j4imt2E9EgDzk/1XdIwnbPGAECajV5z4yTpMuyD9XBhmJQIFutw==", "code": 200})";
 const auto chunkLength = std::format("{:x}", strlen(resp));
 const auto firstChunk = std::format("{}\r\n{}\r\n", chunkLength, resp);
 const auto secondChunk = std::format("0\r\n\r\n");
@@ -113,9 +36,6 @@ size_t respHandler(void *a1, char *content, size_t length, uint64_t *a4, uint32_
         fakeResp = false;
         memcpy(content, aggregated.c_str(), aggregated.size() + 1);
         length = aggregated.size();
-    } else {
-        memcpy(content, versionInfoAggregated.c_str(), versionInfoAggregated.size() + 1);
-        length = versionInfoAggregated.size();
     }
 
     return oRespHandler(a1, content, length, a4, a5);
@@ -124,15 +44,32 @@ size_t respHandler(void *a1, char *content, size_t length, uint64_t *a4, uint32_
 void start() {
     MH_Initialize();
 
+    const auto ntdll = GetModuleHandle(L"ntdll.dll");
+    uint8_t callcode = ((uint8_t *)GetProcAddress(ntdll, "NtQuerySection"))[4] - 1;
+    uint8_t restore[] = {0x4C, 0x8B, 0xD1, 0xB8, callcode};
+
+    volatile auto ntProtectVirtualMemory = (uint8_t *)GetProcAddress(ntdll, "NtProtectVirtualMemory");
+
+    while (true) {
+        if (ntProtectVirtualMemory[0] != 0x4C) {
+            DWORD oldProtect;
+            VirtualProtect((LPVOID)ntProtectVirtualMemory, sizeof(restore), PAGE_EXECUTE_READWRITE, &oldProtect);
+            memcpy(ntProtectVirtualMemory, restore, sizeof(restore));
+            VirtualProtect((LPVOID)ntProtectVirtualMemory, sizeof(restore), oldProtect, nullptr);
+
+            break;
+        }
+    }
+
     MEMORY_BASIC_INFORMATION mbi;
     bool foundBase = false;
-    const auto expectedSize = 0x39d5000;
+    const auto expectedRegion = 0x3c7000;
     char *base = nullptr;
 
     while (foundBase == false) {
         base = nullptr;
         while (VirtualQuery(base, &mbi, sizeof(mbi)) == sizeof(MEMORY_BASIC_INFORMATION)) {
-            if (mbi.RegionSize == expectedSize) {
+            if (mbi.RegionSize == expectedRegion) {
                 foundBase = true;
                 break;
             }
@@ -141,17 +78,6 @@ void start() {
         }
     }
 
-    const auto expectedRegion = 0x3cc000;
-
-    {
-        const void *found = Sig::find(base, expectedRegion,
-                                      "40 53 48 83 EC 20 33 C0 0F 57 C0 0F 11 01 48 89 41 10 48 8B D9 48 89 41 18 "
-                                      "49 C7 C0 FF FF FF FF 49 FF C0 42");
-
-        MH_CreateHook((LPVOID)found, (LPVOID)copy, (LPVOID *)&oCopy);
-        MH_EnableHook((LPVOID)found);
-    }
-
     {
         const void *found =
             Sig::find(base, expectedRegion, "89 54 24 10 4C 89 44 24 18 4C 89 4C 24 20 48 83 EC 28 48 85 C9");
diff --git a/lol/exe.cpp b/lol/exe.cpp
@@ -9,15 +9,15 @@
 #include "MinHook.h"
 #include "Sig.hpp"
 
-typedef char **(*hwid_t)(char **);
+typedef uintptr_t (*hwid_t)(uintptr_t, size_t, size_t, uintptr_t);
 hwid_t oHwid = nullptr;
+uintptr_t hwid(uintptr_t a1, size_t a2, size_t a3, uintptr_t a4) {
+    if (a1 == 0x14ecf0) {
+        const auto s = std::string("---------Hi-Korepi-Devs---------");
+        memcpy((void *)a4, s.c_str(), s.size() + 1);
+    }
 
-char **hwid(char **ret) {
-    oHwid(ret);
-    const auto s = std::string("---------Hi-Korepi-Devs---------");
-    memcpy(*ret, s.c_str(), s.size() + 1);
-
-    return ret;
+    return oHwid(a1, a2, a3, a4);
 }
 
 bool fakeResp = false;
@@ -37,42 +37,21 @@ void options(void *a1, size_t a2, void *a3) {
 
 typedef size_t (*respHandler_t)(void *, char *, size_t, uint64_t *, uint32_t *a5);
 respHandler_t oRespHandler = nullptr;
-
-const auto resp = R"({
-    "msg": "Hi there",
-    "code": 200,
-    "data": {
-        "createBy": null,
-        "createTime": "2024-05-25T14:06:09.662Z",
-        "updateBy": "anonymousUser",
-        "updateTime": "2024-05-25T14:06:09.662Z",
-        "delFlag": 0,
-        "remark": "Oops!",
-        "id": 44262,
-        "roleValue": 25,
-        "cardKey": null,
-        "expiryTime": "2038-01-19T03:14:07.000Z",
-        "lastLoginTime": "2024-05-25T14:06:09.662Z",
-        "hwid": "---------Hi-Korepi-Devs---------",
-        "fileMd5": "mokPVuACUwR5Qw==",
-        "resetTime": null,
-        "resetNum": 4,
-        "pauseTime": null,
-        "status": 0
-    },
-    "signature": "a5879201e7fb4e3064390fccb0d8bbcf628c70bb237843101f314710ebfa0adc",
-    "sign2": "coUVZrl9x43Dql30LoOOpp/U7+gVb7298CeYu6uu8gT1RRxsf4jvyz/xQckiDWd5Sj43dl5AAzdmJGPPFtyQC3haU20H6v09C6whJqSwHDuizT+SW7VFZbWT3jhc+y1bgkYEhbyxHK9hkTGF8hlMk6HSkhAg1vl8t/E7ZcScmh22ZRYXMRijZEEPCgNbDTXDwySqdRnEaLc17z4uvGG/+B2C/60T4aH4VFnFjDyCuIlxCOgMOUM3QcXj0KZakmHxddURpAULfBi00LCamJlJIeUFbnlg3vcrNoCxD/jpHmdZn0jr30jXpgljhAb5AxsX1xwdF5wYROiJTWv6U6nm0A=="
-})";
+const auto resp =
+    R"({"msg": "vpJSftgQ2noDAZR3Iri/ForvdhDZvxwlJCXowV9TgKSs+BoMyBMOIuxjpDcMTSov1thaXhg/d9aAKcpxOP6glQ3bSd8bHIGMku3Ck/33VdYhtzx4HwC4Lel5mVGZ9+2jffsIgHyIwxMl+8kYwh/QGQRlkC8zFfyNaMszsZiOxIJCy/RMYfI3buvCDPH/4D1/VxysPnaX+QtrVrs7Bt74byqnd38bi0GhpllEWL7CO+7fI+vMe2OSv6s0CUaOqzhDC5N8wIkHsthyVyP+GYoltTov3Bu5iaxmgZc/eYQPTkTWQ759pIVNjKJwnQI3EtOEdrRog6LAkA/CMGwMwBkScvY508Z3KhnNqqIIF9RpYLI6rdST+o2t5gIK4sElQg/2wHZT6wSm23t7YdxnwzEFZysv/H0y63iI4NMUmyZIkRvCyxlWVMpTt/rV9qubdbCjGDxG7A/0LbxCJBfBgEWu4Krpp1S+hk4qgIB+2apCh5sxU76mLzQdFLzNrgmbQADapyDO6rWw777F9FKlo/r9II8kISi/+2FxXp7TZE3ALbcyUo7zKucahsq7u9ucENm64D3PKV4YZCHchQY7xyYI4DaC1PQzleJxGaGbCoBQ0PZK7f33d3N3qB10OaEfe2de4uTcOKbVAjtjSLrlZcMGiZd40Bho76xCtcgAKG2FDxbH/PJo4BoIYwqiDzqpmxXBOsn0JqKLGLaAyU840GAgyLO62lE7/A26w+B9q7hkOIcKlfXZpdwjsll/dADe2U/uF5nrLxEOUGDx9gbUoB95KLD1S3KCCyaLuv8j4imt2E9EgDzk/1XdIwnbPGAECajV5z4yTpMuyD9XBhmJQIFutw==", "code": 200})";
 const auto chunkLength = std::format("{:x}", strlen(resp));
 const auto firstChunk = std::format("{}\r\n{}\r\n", chunkLength, resp);
 const auto secondChunk = std::format("0\r\n\r\n");
 const auto aggregated = firstChunk + secondChunk;
 
+bool doneMagic = false;
+
 size_t respHandler(void *a1, char *content, size_t length, uint64_t *a4, uint32_t *a5) {
     if (fakeResp == true) {
         fakeResp = false;
         memcpy(content, aggregated.c_str(), aggregated.size() + 1);
         length = aggregated.size();
+        doneMagic = true;
     }
 
     return oRespHandler(a1, content, length, a4, a5);
@@ -149,7 +128,7 @@ void start() {
     {
         const void *found = Sig::find(
             exe, size,
-            "48 89 5C 24 10 48 89 74 24 18 48 89 7C 24 20 55 41 54 41 55 41 56 41 57 48 8D 6C 24 C9 48 81 EC C0");
+            "40 53 56 41 56 41 57 48 83 EC 28 48 BB FF FF FF FF FF FF FF 7F 4D 8B F9 4C 8B F2 48 8B F1 48 3B D3");
 
         if (found != nullptr) {
             MH_CreateHook((LPVOID)found, hwid, (LPVOID *)&oHwid);
@@ -175,6 +154,13 @@ void start() {
         }
     }
 
+    while (doneMagic == false) {
+        Sleep(1);
+    }
+
+    MH_DisableHook(MH_ALL_HOOKS);
+    MH_RemoveHook(MH_ALL_HOOKS);
+
     {
         const auto remoteThreadEx = GetProcAddress(GetModuleHandle(L"kernel32.dll"), "CreateRemoteThreadEx");
         MH_CreateHook((LPVOID)remoteThreadEx, (LPVOID)createThread, (LPVOID *)&oCreateRemoteThreadEx);
diff --git a/test_extend.py b/test_extend.py
