From 7c14e13c717c25818780ff4cc459d82a2ec0473a Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Thu, 11 Jun 2015 01:15:14 +0300 Subject: refactoring --- test/aes256ctr_decrypt_block.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'test/aes256ctr_decrypt_block.c') diff --git a/test/aes256ctr_decrypt_block.c b/test/aes256ctr_decrypt_block.c index 79d60e4..0bf1545 100644 --- a/test/aes256ctr_decrypt_block.c +++ b/test/aes256ctr_decrypt_block.c @@ -14,7 +14,7 @@ static void exit_with_usage() { - puts("Usage: aes256ctr_decrypt_block.exe KEY0 IV0 [CIPHER0...] [-- KEY1 IV1 [CIPHER1...]...]"); + puts("Usage: aesni_decrypt_block_ctr256.exe KEY0 IV0 [CIPHER0...] [-- KEY1 IV1 [CIPHER1...]...]"); exit(EXIT_FAILURE); } @@ -22,26 +22,26 @@ int main(int argc, char** argv) { for (--argc, ++argv; argc > -1; --argc, ++argv) { - AesBlock128 plain, cipher, iv; - AesBlock256 key; - Aes256KeySchedule key_schedule; + AesNI_Block128 plain, cipher, iv; + AesNI_Block256 key; + AesNI_KeySchedule256 key_schedule; if (argc < 2) exit_with_usage(); - if (parse_aes_block256(&key, *argv) != 0) + if (aesni_parse_block256(&key, *argv) != 0) { fprintf(stderr, "Invalid 256-bit AES block '%s'\n", *argv); exit_with_usage(); } - if (parse_aes_block128(&iv, argv[1]) != 0) + if (aesni_parse_block128(&iv, argv[1]) != 0) { fprintf(stderr, "Invalid 128-bit AES block '%s'\n", argv[1]); exit_with_usage(); } - aes256_expand_key_schedule(&key, &key_schedule); + aesni_expand_key_schedule256(&key, &key_schedule); int ctr = 0; @@ -50,13 +50,13 @@ int main(int argc, char** argv) if (strcmp("--", *argv) == 0) break; - if (parse_aes_block128(&cipher, *argv) != 0) + if (aesni_parse_block128(&cipher, *argv) != 0) { fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv); continue; } - plain = aes256ctr_decrypt_block(cipher, &key_schedule, iv, ctr++); - print_aes_block128(&plain); + plain = aesni_decrypt_block_ctr256(cipher, &key_schedule, iv, ctr++); + aesni_print_block128(&plain); } } -- cgit v1.2.3