From 522a5b906d7620bcebddb5a8f476b022c140ab27 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Wed, 17 Jun 2015 20:07:32 +0300 Subject: factoring out AES-specific stuff --- test/decrypt_block_aes.cpp | 8 ++++---- test/encrypt_block_aes.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'test') diff --git a/test/decrypt_block_aes.cpp b/test/decrypt_block_aes.cpp index acc9c6b..6cb9ce7 100644 --- a/test/decrypt_block_aes.cpp +++ b/test/decrypt_block_aes.cpp @@ -34,10 +34,10 @@ int main(int argc, char** argv) if (argc < 2) exit_with_usage(); - AesNI_AlgorithmParams algorithm_params; + AesNI_BoxAlgorithmParams algorithm_params; aesni::from_string(algorithm_params.aes128_key, argv[0]); - AesNI_State iv; + AesNI_BoxBlock iv; aesni::from_string(iv.aes_block, argv[1]); AesNI_Box box; @@ -54,10 +54,10 @@ int main(int argc, char** argv) if (std::strcmp("--", argv[0]) == 0) break; - AesNI_State ciphertext; + AesNI_BoxBlock ciphertext; aesni::from_string(ciphertext.aes_block, argv[0]); - AesNI_State plaintext; + AesNI_BoxBlock plaintext; aesni_box_decrypt( &box, &ciphertext, diff --git a/test/encrypt_block_aes.cpp b/test/encrypt_block_aes.cpp index 9db6e32..f15ddda 100644 --- a/test/encrypt_block_aes.cpp +++ b/test/encrypt_block_aes.cpp @@ -34,10 +34,10 @@ int main(int argc, char** argv) if (argc < 2) exit_with_usage(); - AesNI_AlgorithmParams algorithm_params; + AesNI_BoxAlgorithmParams algorithm_params; aesni::from_string(algorithm_params.aes128_key, argv[0]); - AesNI_State iv; + AesNI_BoxBlock iv; aesni::from_string(iv.aes_block, argv[1]); AesNI_Box box; @@ -54,10 +54,10 @@ int main(int argc, char** argv) if (std::strcmp("--", argv[0]) == 0) break; - AesNI_State plaintext; + AesNI_BoxBlock plaintext; aesni::from_string(plaintext.aes_block, argv[0]); - AesNI_State ciphertext; + AesNI_BoxBlock ciphertext; aesni_box_encrypt( &box, &plaintext, -- cgit v1.2.3