aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/test/aes128ecb_encrypt_block.c
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2015-06-17 23:25:52 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2015-06-17 23:25:52 +0300
commit44d58e0a10c7dfdb33899fa98c0eea790e0b90ce (patch)
tree646541b156ffdd88bbaa4f1fa860aed465dfce60 /test/aes128ecb_encrypt_block.c
parentrefactoring (diff)
downloadaes-tools-44d58e0a10c7dfdb33899fa98c0eea790e0b90ce.tar.gz
aes-tools-44d58e0a10c7dfdb33899fa98c0eea790e0b90ce.zip
factoring out AES-specific stuff
Diffstat (limited to 'test/aes128ecb_encrypt_block.c')
-rw-r--r--test/aes128ecb_encrypt_block.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/test/aes128ecb_encrypt_block.c b/test/aes128ecb_encrypt_block.c
index 1c73e90..77bb557 100644
--- a/test/aes128ecb_encrypt_block.c
+++ b/test/aes128ecb_encrypt_block.c
@@ -22,32 +22,33 @@ int main(int argc, char** argv)
{
for (--argc, ++argv; argc > -1; --argc, ++argv)
{
- AesNI_Block128 plaintext, key, ciphertext;
+ AesNI_Block128 plaintext, ciphertext;
+ AesNI_Aes128_Key key;
AesNI_Aes128_RoundKeys encryption_keys;
if (argc < 1)
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();
}
- aesni_aes128_expand_key(key, &encryption_keys);
+ aesni_aes128_expand_key(&key, &encryption_keys);
for (--argc, ++argv; 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_ecb(plaintext, &encryption_keys);
- aesni_print_block128(&ciphertext, NULL);
+ aesni_aes_print_block(&ciphertext, NULL);
}
}