factoring out AES-specific stuff

1 files changed, 7 insertions, 6 deletions

diff --git a/test/aes128cbc_encrypt_block.c b/test/aes128cbc_encrypt_block.c
index 15348de..d51a673 100644
--- a/test/aes128cbc_encrypt_block.c
+++ b/test/aes128cbc_encrypt_block.c
@@ -22,38 +22,39 @@ int main(int argc, char** argv)
 {
     for (--argc, ++argv; argc > -1; --argc, ++argv)
     {
-        AesNI_Block128 plaintext, key, ciphertext, iv;
+        AesNI_Block128 plaintext, ciphertext, iv;
+        AesNI_Aes128_Key key;
         AesNI_Aes128_RoundKeys encryption_keys;
 
         if (argc < 2)
             exit_with_usage();
 
-        if (aesni_is_error(aesni_parse_block128(&key, *argv, NULL)))
+        if (aesni_is_error(aesni_aes128_parse_key(&key, *argv, NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
             exit_with_usage();
         }
 
-        if (aesni_is_error(aesni_parse_block128(&iv, argv[1], NULL)))
+        if (aesni_is_error(aesni_aes_parse_block(&iv, argv[1], NULL)))
         {
             fprintf(stderr, "Invalid 128-bit AES block '%s'\n", argv[1]);
             exit_with_usage();
         }
 
-        aesni_aes128_expand_key(key, &encryption_keys);
+        aesni_aes128_expand_key(&key, &encryption_keys);
 
         for (argc -= 2, argv += 2; argc > 0; --argc, ++argv)
         {
             if (strcmp("--", *argv) == 0)
                 break;
 
-            if (aesni_is_error(aesni_parse_block128(&plaintext, *argv, NULL)))
+            if (aesni_is_error(aesni_aes_parse_block(&plaintext, *argv, NULL)))
             {
                 fprintf(stderr, "Invalid 128-bit AES block '%s'\n", *argv);
                 continue;
             }
             ciphertext = aesni_aes128_encrypt_block_cbc(plaintext, &encryption_keys, iv, &iv);
-            aesni_print_block128(&ciphertext, NULL);
+            aesni_aes_print_block(&ciphertext, NULL);
         }
     }