From 44d58e0a10c7dfdb33899fa98c0eea790e0b90ce Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Wed, 17 Jun 2015 23:25:52 +0300 Subject: factoring out AES-specific stuff --- test/aes128cfb_encrypt_block.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'test/aes128cfb_encrypt_block.c') diff --git a/test/aes128cfb_encrypt_block.c b/test/aes128cfb_encrypt_block.c index e238048..fd64dc6 100644 --- a/test/aes128cfb_encrypt_block.c +++ b/test/aes128cfb_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_cfb(plaintext, &encryption_keys, iv, &iv); - aesni_print_block128(&ciphertext, NULL); + aesni_aes_print_block(&ciphertext, NULL); } } -- cgit v1.2.3