From 5452021ab756fa786d6c84987e885db2e3f82e31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20V=C3=B6gele?= Date: Tue, 2 Jul 2019 14:30:36 +0200 Subject: [PATCH] Remove decryption functinos as they aren't necessary for this challange --- aes.cpp | 117 -------------------------------------------------------- aes.hpp | 11 ------ 2 files changed, 128 deletions(-) diff --git a/aes.cpp b/aes.cpp index d349582..652c6fa 100644 --- a/aes.cpp +++ b/aes.cpp @@ -25,24 +25,6 @@ const uint8_t AES::sbox[256] = { 0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf, 0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16 }; -const uint8_t AES::r_sbox[256] = { - 0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb, - 0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87, 0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb, - 0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d, 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e, - 0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25, - 0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16, 0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92, - 0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda, 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84, - 0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06, - 0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02, 0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b, - 0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea, 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73, - 0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e, - 0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89, 0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b, - 0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20, 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4, - 0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f, - 0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d, 0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef, - 0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0, 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61, - 0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d }; - const uint8_t AES::rc[10] = { 0b00000001, 0b00000010, @@ -84,24 +66,6 @@ void AES::encrypt_ecb(uint8_t data[16], const uint8_t key[16]) add_round_key(data, round_keys[10]); } -void AES::decrypt_ecb(uint8_t data[16], const uint8_t key[16]) -{ - PROFILER_RECORD; - uint8_t round_keys[11][16]; - construct_round_keys(key, round_keys); - add_round_key(data, round_keys[10]); - r_shift_rows(data); - r_sub_bytes(data); - for (int r = 9;r > 0;r--) - { - add_round_key(data, round_keys[r]); - r_mix_columns(data); - r_shift_rows(data); - r_sub_bytes(data); - } - add_round_key(data, round_keys[0]); -} - void AES::add_round_key(uint8_t data_[16], const uint8_t key_[16]) { PROFILER_RECORD; @@ -122,15 +86,6 @@ void AES::sub_bytes(uint8_t data[16]) } } -void AES::r_sub_bytes(uint8_t data[16]) -{ - PROFILER_RECORD; - for (int i = 0;i < 16;i++) - { - data[i] = r_sbox[data[i]]; - } -} - #define SWAP(x, y, tmp) tmp = x; x = y; y = tmp void AES::shift_rows(uint8_t data[16]) @@ -152,25 +107,6 @@ void AES::shift_rows(uint8_t data[16]) data[3] = tmp; } -void AES::r_shift_rows(uint8_t data[16]) -{ - PROFILER_RECORD; - uint8_t tmp = data[13]; - data[13] = data[9]; - data[9] = data[5]; - data[5] = data[1]; - data[1] = tmp; - - SWAP(data[2], data[10], tmp); - SWAP(data[6], data[14], tmp); - - tmp = data[3]; - data[3] = data[7]; - data[7] = data[11]; - data[11] = data[15]; - data[15] = tmp; -} - #undef SWAP void AES::mix_columns(uint8_t data[16]) @@ -187,20 +123,6 @@ void AES::mix_columns(uint8_t data[16]) memcpy(data, data_new, 16); } -void AES::r_mix_columns(uint8_t data[16]) -{ - PROFILER_RECORD; - uint8_t data_new[16]; - for (int i = 0;i < 4;i++) - { - data_new[i * 4 + 0] = gf_multE(data[i * 4 + 0]) ^ gf_multB(data[i * 4 + 1]) ^ gf_multD(data[i * 4 + 2]) ^ gf_mult9(data[i * 4 + 3]); - data_new[i * 4 + 1] = gf_mult9(data[i * 4 + 0]) ^ gf_multE(data[i * 4 + 1]) ^ gf_multB(data[i * 4 + 2]) ^ gf_multD(data[i * 4 + 3]); - data_new[i * 4 + 2] = gf_multD(data[i * 4 + 0]) ^ gf_mult9(data[i * 4 + 1]) ^ gf_multE(data[i * 4 + 2]) ^ gf_multB(data[i * 4 + 3]); - data_new[i * 4 + 3] = gf_multB(data[i * 4 + 0]) ^ gf_multD(data[i * 4 + 1]) ^ gf_mult9(data[i * 4 + 2]) ^ gf_multE(data[i * 4 + 3]); - } - mempcpy(data, data_new, 16); -} - void AES::construct_round_keys(const uint8_t initial_key_[16], uint8_t round_keys_[11][16]) { PROFILER_RECORD; @@ -257,42 +179,3 @@ uint8_t AES::gf_mult3(uint8_t value) PROFILER_RECORD; return gf_mult2(value) ^ value; } - -uint8_t AES::gf_mult4(uint8_t value) -{ - PROFILER_RECORD; - return gf_mult2(gf_mult2(value)); -} - -uint8_t AES::gf_mult8(uint8_t value) -{ - PROFILER_RECORD; - return gf_mult2(gf_mult4(value)); -} - -uint8_t AES::gf_mult9(uint8_t value) -{ - PROFILER_RECORD; - return gf_mult8(value) ^ value; -} - -uint8_t AES::gf_multB(uint8_t value) -{ - PROFILER_RECORD; - return gf_mult8(value) ^ gf_mult3(value); -} - -uint8_t AES::gf_multD(uint8_t value) -{ - PROFILER_RECORD; - uint8_t gf4 = gf_mult4(value); - return gf_mult2(gf4) ^ gf4 ^ value; -} - -uint8_t AES::gf_multE(uint8_t value) -{ - PROFILER_RECORD; - uint8_t gf2 = gf_mult2(value); - uint8_t gf4 = gf_mult2(gf2); - return gf_mult2(gf4) ^ gf4 ^ gf2; -} diff --git a/aes.hpp b/aes.hpp index bada25d..37b2f2b 100644 --- a/aes.hpp +++ b/aes.hpp @@ -7,31 +7,20 @@ class AES { private: static const uint8_t sbox[256]; - static const uint8_t r_sbox[256]; static const uint8_t rc[10]; static const uint8_t irreducible_polynomial; public: AES(); static void encrypt_ecb(uint8_t data[16], const uint8_t key[16]); - static void decrypt_ecb(uint8_t data[16], const uint8_t key[16]); static void construct_round_keys(const uint8_t initial_key_[16], uint8_t round_keys_[11][16]); static uint32_t roundkey_g(uint32_t last_roundkey, uint8_t round); static void add_round_key(uint8_t data[16], const uint8_t key[16]); static void shift_rows(uint8_t data[16]); - static void r_shift_rows(uint8_t data[16]); static void sub_bytes(uint8_t data[16]); - static void r_sub_bytes(uint8_t data[16]); static void mix_columns(uint8_t data[16]); - static void r_mix_columns(uint8_t data[16]); static void print_data(uint8_t data[16]); static uint8_t gf_mult2(uint8_t value); static uint8_t gf_mult3(uint8_t value); - static uint8_t gf_mult4(uint8_t value); - static uint8_t gf_mult8(uint8_t value); - static uint8_t gf_mult9(uint8_t value); - static uint8_t gf_multB(uint8_t value); - static uint8_t gf_multD(uint8_t value); - static uint8_t gf_multE(uint8_t value); static uint8_t gf_reduce(uint8_t value); };