refactoring

1 files changed, 11 insertions, 11 deletions

diff --git a/test/aes256cbc_decrypt_block.c b/test/aes256cbc_decrypt_block.c
index 7a1defe..f58dfa7 100644
--- a/test/aes256cbc_decrypt_block.c
+++ b/test/aes256cbc_decrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes256cbc_decrypt_block.exe KEY0 IV0 [CIPHER0...] [-- KEY1 IV1 [CIPHER1...]...]");
+    puts("Usage: aesni_decrypt_block_cbc256.exe KEY0 IV0 [CIPHER0...] [-- KEY1 IV1 [CIPHER1...]...]");
     exit(EXIT_FAILURE);
 }
 
@@ -22,40 +22,40 @@ int main(int argc, char** argv)
 {
     for (--argc, ++argv; argc > -1; --argc, ++argv)
     {
-        AesBlock128 plain, cipher, iv;
-        AesBlock256 key;
-        Aes256KeySchedule key_schedule, inverted_schedule;
+        AesNI_Block128 plain, cipher, iv;
+        AesNI_Block256 key;
+        AesNI_KeySchedule256 key_schedule, inverted_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);
-        aes256_invert_key_schedule(&key_schedule, &inverted_schedule);
+        aesni_expand_key_schedule256(&key, &key_schedule);
+        aesni_invert_key_schedule256(&key_schedule, &inverted_schedule);
 
         for (argc -= 2, argv += 2; argc > 0; --argc, ++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 = aes256cbc_decrypt_block(cipher, &inverted_schedule, iv, &iv);
-            print_aes_block128(&plain);
+            plain = aesni_decrypt_block_cbc256(cipher, &inverted_schedule, iv, &iv);
+            aesni_print_block128(&plain);
         }
     }