From 52afbab204ff1560c6f5fce365dbc8bd0aa55759 Mon Sep 17 00:00:00 2001 From: Matteo Brichese Date: Mon, 5 Jun 2017 18:36:46 -0700 Subject: cleaning up --- aes.h | 2 ++ test.c | 23 +++++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/aes.h b/aes.h index b5be559..9c5d786 100644 --- a/aes.h +++ b/aes.h @@ -18,6 +18,8 @@ #define ECB 1 #endif +#define AES128 + #if defined(ECB) && ECB diff --git a/test.c b/test.c index a95d52f..b15c223 100644 --- a/test.c +++ b/test.c @@ -25,7 +25,7 @@ int main(void) test_decrypt_ecb(); test_encrypt_ecb(); test_encrypt_ecb_verbose(); - + return 0; } @@ -74,7 +74,7 @@ static void test_encrypt_ecb_verbose(void) printf("ciphertext:\n"); for(i = 0; i < 4; ++i) { - AES128_ECB_encrypt(plain_text + (i*16), key, buf+(i*16)); + AES_ECB_encrypt(plain_text + (i*16), key, buf+(i*16), 16); phex(buf + (i*16)); } printf("\n"); @@ -88,7 +88,7 @@ static void test_encrypt_ecb(void) uint8_t out[] = {0x3a, 0xd7, 0x7b, 0xb4, 0x0d, 0x7a, 0x36, 0x60, 0xa8, 0x9e, 0xca, 0xf3, 0x24, 0x66, 0xef, 0x97}; uint8_t buffer[16]; - AES128_ECB_encrypt(in, key, buffer); + AES_ECB_encrypt(in, key, buffer, 16); printf("ECB decrypt: "); @@ -110,7 +110,7 @@ static void test_decrypt_cbc(void) uint8_t iv[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }; uint8_t in[] = { 0x76, 0x49, 0xab, 0xac, 0x81, 0x19, 0xb2, 0x46, 0xce, 0xe9, 0x8e, 0x9b, 0x12, 0xe9, 0x19, 0x7d, 0x50, 0x86, 0xcb, 0x9b, 0x50, 0x72, 0x19, 0xee, 0x95, 0xdb, 0x11, 0x3a, 0x91, 0x76, 0x78, 0xb2, - 0x73, 0xbe, 0xd6, 0xb8, 0xe3, 0xc1, 0x74, 0x3b, 0x71, 0x16, 0xe6, 0x9e, 0x22, 0x22, 0x95, 0x16, + 0x73, 0xbe, 0xd6, 0xb8, 0xe3, 0xc1, 0x74, 0x3b, 0x71, 0x16, 0xe6, 0x9e, 0x22, 0x22, 0x95, 0x16, 0x3f, 0xf1, 0xca, 0xa1, 0x68, 0x1f, 0xac, 0x09, 0x12, 0x0e, 0xca, 0x30, 0x75, 0x86, 0xe1, 0xa7 }; uint8_t out[] = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, @@ -118,10 +118,10 @@ static void test_decrypt_cbc(void) 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10 }; uint8_t buffer[64]; - AES128_CBC_decrypt_buffer(buffer+0, in+0, 16, key, iv); - AES128_CBC_decrypt_buffer(buffer+16, in+16, 16, 0, 0); - AES128_CBC_decrypt_buffer(buffer+32, in+32, 16, 0, 0); - AES128_CBC_decrypt_buffer(buffer+48, in+48, 16, 0, 0); + AES_CBC_decrypt_buffer(buffer+0, in+0, 16, key, iv); + AES_CBC_decrypt_buffer(buffer+16, in+16, 16, 0, 0); + AES_CBC_decrypt_buffer(buffer+32, in+32, 16, 0, 0); + AES_CBC_decrypt_buffer(buffer+48, in+48, 16, 0, 0); printf("CBC decrypt: "); @@ -145,11 +145,11 @@ static void test_encrypt_cbc(void) 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10 }; uint8_t out[] = { 0x76, 0x49, 0xab, 0xac, 0x81, 0x19, 0xb2, 0x46, 0xce, 0xe9, 0x8e, 0x9b, 0x12, 0xe9, 0x19, 0x7d, 0x50, 0x86, 0xcb, 0x9b, 0x50, 0x72, 0x19, 0xee, 0x95, 0xdb, 0x11, 0x3a, 0x91, 0x76, 0x78, 0xb2, - 0x73, 0xbe, 0xd6, 0xb8, 0xe3, 0xc1, 0x74, 0x3b, 0x71, 0x16, 0xe6, 0x9e, 0x22, 0x22, 0x95, 0x16, + 0x73, 0xbe, 0xd6, 0xb8, 0xe3, 0xc1, 0x74, 0x3b, 0x71, 0x16, 0xe6, 0x9e, 0x22, 0x22, 0x95, 0x16, 0x3f, 0xf1, 0xca, 0xa1, 0x68, 0x1f, 0xac, 0x09, 0x12, 0x0e, 0xca, 0x30, 0x75, 0x86, 0xe1, 0xa7 }; uint8_t buffer[64]; - AES128_CBC_encrypt_buffer(buffer, in, 64, key, iv); + AES_CBC_encrypt_buffer(buffer, in, 64, key, iv); printf("CBC encrypt: "); @@ -171,7 +171,7 @@ static void test_decrypt_ecb(void) uint8_t out[] = {0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a}; uint8_t buffer[16]; - AES128_ECB_decrypt(in, key, buffer); + AES_ECB_decrypt(in, key, buffer, 16); printf("ECB decrypt: "); @@ -185,4 +185,3 @@ static void test_decrypt_ecb(void) } } - -- cgit v1.2.3