From 0340821cc614fda2a94a96c255d16105dd2f6f9a Mon Sep 17 00:00:00 2001 From: boris Date: Sat, 29 Dec 2018 22:15:34 +1300 Subject: tcp is being autistic -_- --- csgo-loader/csgo-client/Security/Encryption.cpp | 94 +++++++++---------------- 1 file changed, 33 insertions(+), 61 deletions(-) (limited to 'csgo-loader/csgo-client/Security/Encryption.cpp') diff --git a/csgo-loader/csgo-client/Security/Encryption.cpp b/csgo-loader/csgo-client/Security/Encryption.cpp index 460bda9..6bc3640 100644 --- a/csgo-loader/csgo-client/Security/Encryption.cpp +++ b/csgo-loader/csgo-client/Security/Encryption.cpp @@ -106,19 +106,17 @@ namespace Wrapper { Aes256 aes(key); - WRAP_IF_RELEASE(VM_FISH_BLACK_START); + WRAP_IF_RELEASE(VM_EAGLE_BLACK_START); aes.encrypt_start(plain.size(), encrypted); aes.encrypt_continue(plain, encrypted); aes.encrypt_end(encrypted); - WRAP_IF_RELEASE(VM_FISH_BLACK_END); + WRAP_IF_RELEASE(VM_EAGLE_BLACK_END); return encrypted.size(); } -#pragma optimize("", on) - ByteArray::size_type Aes256::encrypt(const ByteArray& key, const unsigned char* plain, const ByteArray::size_type plain_length, ByteArray& encrypted) { Aes256 aes(key); @@ -130,25 +128,21 @@ namespace Wrapper return encrypted.size(); } -#pragma optimize("", off) - ByteArray::size_type Aes256::decrypt(const ByteArray& key, const ByteArray& encrypted, ByteArray& plain) { Aes256 aes(key); - WRAP_IF_RELEASE(VM_FISH_BLACK_START); + WRAP_IF_RELEASE(VM_EAGLE_BLACK_START); aes.decrypt_start(encrypted.size()); aes.decrypt_continue(encrypted, plain); aes.decrypt_end(plain); - WRAP_IF_RELEASE(VM_FISH_BLACK_END); + WRAP_IF_RELEASE(VM_EAGLE_BLACK_END); return plain.size(); } -#pragma optimize("", on) - ByteArray::size_type Aes256::decrypt(const ByteArray& key, const unsigned char* encrypted, const ByteArray::size_type encrypted_length, ByteArray& plain) { Aes256 aes(key); @@ -254,13 +248,11 @@ namespace Wrapper return encrypted.size(); } -#pragma optimize("", off) - void Aes256::encrypt(unsigned char* buffer) { unsigned char i, rcon; - WRAP_IF_RELEASE(VM_SHARK_BLACK_START); + WRAP_IF_RELEASE(VM_EAGLE_BLACK_START); copy_key(); add_round_key(buffer, 0); @@ -278,11 +270,9 @@ namespace Wrapper expand_enc_key(&rcon); add_round_key(buffer, i); - WRAP_IF_RELEASE(VM_SHARK_BLACK_END); + WRAP_IF_RELEASE(VM_EAGLE_BLACK_END); } -#pragma optimize("", on) - ByteArray::size_type Aes256::decrypt_start(const ByteArray::size_type encrypted_length) { unsigned char j; @@ -370,13 +360,11 @@ namespace Wrapper return plain.size(); } -#pragma optimize("", off) - void Aes256::decrypt(unsigned char* buffer) { unsigned char i, rcon = 1; - WRAP_IF_RELEASE(VM_SHARK_BLACK_START); + WRAP_IF_RELEASE(VM_EAGLE_BLACK_START); copy_key(); for(i = NUM_ROUNDS / 2; i > 0; --i) @@ -397,12 +385,9 @@ namespace Wrapper } add_round_key(buffer, i); - WRAP_IF_RELEASE(VM_SHARK_BLACK_END); + WRAP_IF_RELEASE(VM_EAGLE_BLACK_END); } -#pragma optimize("", on) - -#pragma optimize("", off) void Aes256::expand_enc_key(unsigned char* rc) { unsigned char i; @@ -422,6 +407,10 @@ namespace Wrapper m_rkey[i + 2] = m_rkey[i + 2] ^ m_rkey[i - 2]; m_rkey[i + 3] = m_rkey[i + 3] ^ m_rkey[i - 1]; } + + WRAP_IF_RELEASE(MUTATE_END); + WRAP_IF_RELEASE(VM_EAGLE_BLACK_START); + m_rkey[16] = m_rkey[16] ^ sbox[m_rkey[12]]; m_rkey[17] = m_rkey[17] ^ sbox[m_rkey[13]]; m_rkey[18] = m_rkey[18] ^ sbox[m_rkey[14]]; @@ -435,13 +424,9 @@ namespace Wrapper m_rkey[i + 3] = m_rkey[i + 3] ^ m_rkey[i - 1]; } - WRAP_IF_RELEASE(MUTATE_END); + WRAP_IF_RELEASE(VM_EAGLE_BLACK_END); } -#pragma optimize("", on) - -#pragma optimize("", off) - void Aes256::expand_dec_key(unsigned char* rc) { unsigned char i; @@ -461,6 +446,9 @@ namespace Wrapper m_rkey[18] = m_rkey[18] ^ sbox[m_rkey[14]]; m_rkey[19] = m_rkey[19] ^ sbox[m_rkey[15]]; + WRAP_IF_RELEASE(MUTATE_END); + WRAP_IF_RELEASE(VM_EAGLE_BLACK_START); + for(i = 12; i > 0; i -= 4) { m_rkey[i + 0] = m_rkey[i + 0] ^ m_rkey[i - 4]; @@ -475,11 +463,9 @@ namespace Wrapper m_rkey[2] = m_rkey[2] ^ sbox[m_rkey[31]]; m_rkey[3] = m_rkey[3] ^ sbox[m_rkey[28]]; - WRAP_IF_RELEASE(MUTATE_END); + WRAP_IF_RELEASE(VM_EAGLE_BLACK_END); } -#pragma optimize("", on) - void Aes256::sub_bytes(unsigned char* buffer) { unsigned char i = KEY_SIZE / 2; @@ -514,13 +500,11 @@ namespace Wrapper buffer[i] ^= m_rkey[(round & 1) ? i + 16 : i]; } -#pragma optimize("", off) - void Aes256::shift_rows(unsigned char* buffer) { unsigned char i, j, k, l; /* to make it potentially parallelable :) */ - WRAP_IF_RELEASE(MUTATE_START); + WRAP_IF_RELEASE(VM_EAGLE_BLACK_START); i = buffer[1]; buffer[1] = buffer[5]; @@ -532,6 +516,9 @@ namespace Wrapper buffer[10] = buffer[2]; buffer[2] = j; + WRAP_IF_RELEASE(VM_EAGLE_BLACK_END); + WRAP_IF_RELEASE(MUTATE_START); + k = buffer[3]; buffer[3] = buffer[15]; buffer[15] = buffer[11]; @@ -545,15 +532,11 @@ namespace Wrapper WRAP_IF_RELEASE(MUTATE_END); } -#pragma optimize("", on) - -#pragma optimize("", off) - void Aes256::shift_rows_inv(unsigned char* buffer) { unsigned char i, j, k, l; /* same as above :) */ - WRAP_IF_RELEASE(MUTATE_START); + WRAP_IF_RELEASE(VM_EAGLE_BLACK_START); i = buffer[1]; buffer[1] = buffer[13]; @@ -565,6 +548,9 @@ namespace Wrapper buffer[2] = buffer[10]; buffer[10] = j; + WRAP_IF_RELEASE(VM_EAGLE_BLACK_END); + WRAP_IF_RELEASE(MUTATE_START); + k = buffer[3]; buffer[3] = buffer[7]; buffer[7] = buffer[11]; @@ -578,15 +564,11 @@ namespace Wrapper WRAP_IF_RELEASE(MUTATE_END); } -#pragma optimize("", on) - -#pragma optimize("", off) - void Aes256::mix_columns(unsigned char* buffer) { unsigned char i, a, b, c, d, e; - WRAP_IF_RELEASE(VM_FISH_BLACK_START); + WRAP_IF_RELEASE(VM_EAGLE_BLACK_START); for(i = 0; i < 16; i += 4) { @@ -603,19 +585,14 @@ namespace Wrapper buffer[i + 3] ^= e ^ rj_xtime(d^a); } - WRAP_IF_RELEASE(VM_FISH_BLACK_END); + WRAP_IF_RELEASE(VM_EAGLE_BLACK_END); } -#pragma optimize("", on) - - -#pragma optimize("", off) - void Aes256::mix_columns_inv(unsigned char* buffer) { unsigned char i, a, b, c, d, e, x, y, z; - WRAP_IF_RELEASE(VM_FISH_BLACK_START); + WRAP_IF_RELEASE(VM_EAGLE_BLACK_START); for(i = 0; i < 16; i += 4) { @@ -634,7 +611,7 @@ namespace Wrapper buffer[i + 3] ^= y ^ rj_xtime(d^a); } - WRAP_IF_RELEASE(VM_FISH_BLACK_END); + WRAP_IF_RELEASE(VM_EAGLE_BLACK_END); } #pragma optimize("", on) @@ -653,7 +630,10 @@ namespace Wrapper if(EncryptionKey.empty()) Start(); - m_EncryptionKey.reserve(EncryptionKey.size()); + WRAP_IF_DEBUG(printf("[DEBUG] Received handshake: %zd bytes.\n[DEBUG] Data: ", EncryptionKey.size());); + WRAP_IF_DEBUG(for(auto &It : EncryptionKey) { printf("%02x ", It); }); + WRAP_IF_DEBUG(printf("\n")); + std::copy(EncryptionKey.begin(), EncryptionKey.end(), m_EncryptionKey.begin()); } @@ -662,11 +642,7 @@ namespace Wrapper // Encrypt outgoing data. ByteArray Encrypted; - #ifdef DEBUG - Encrypted = Data; - #else Aes256::encrypt(m_EncryptionKey, Data, Encrypted); - #endif return Encrypted; } @@ -676,11 +652,7 @@ namespace Wrapper // Decrypt incoming data. ByteArray Decrypted; - #ifdef DEBUG - Decrypted = Data; - #else Aes256::decrypt(m_EncryptionKey, Data, Decrypted); - #endif return Decrypted; } -- cgit v1.2.3