From 8430473494fcdbf39e02fcff80d51124df728e97 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Wed, 17 Jun 2015 21:09:42 +0300 Subject: refactoring --- utils/aes128ecb_decrypt_file.cpp | 10 +++++----- utils/aes128ecb_encrypt_file.cpp | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'utils') diff --git a/utils/aes128ecb_decrypt_file.cpp b/utils/aes128ecb_decrypt_file.cpp index b2abe8f..0f88144 100644 --- a/utils/aes128ecb_decrypt_file.cpp +++ b/utils/aes128ecb_decrypt_file.cpp @@ -37,7 +37,7 @@ namespace int main(int argc, char** argv) { AesNI_Block128 key; - AesNI_Aes128_RoundKeys key_schedule, inverted_schedule; + AesNI_Aes128_RoundKeys encryption_keys, decryption_keys; if (argc != 4) exit_with_usage(); @@ -60,8 +60,8 @@ int main(int argc, char** argv) src_buf.assign(std::istreambuf_iterator(src_ifs), std::istreambuf_iterator()); - aesni_aes128_expand_key(key, &key_schedule); - aesni_aes128_derive_decryption_keys(&key_schedule, &inverted_schedule); + aesni_aes128_expand_key(key, &encryption_keys); + aesni_aes128_derive_decryption_keys(&encryption_keys, &decryption_keys); std::size_t dest_size; @@ -70,7 +70,7 @@ int main(int argc, char** argv) src_size, NULL, &dest_size, - &inverted_schedule, + &decryption_keys, aesni::ErrorDetailsThrowsInDestructor()); std::vector dest_buf; @@ -81,7 +81,7 @@ int main(int argc, char** argv) src_size, dest_buf.data(), &dest_size, - &inverted_schedule, + &decryption_keys, aesni::ErrorDetailsThrowsInDestructor()); std::ofstream dest_ofs; diff --git a/utils/aes128ecb_encrypt_file.cpp b/utils/aes128ecb_encrypt_file.cpp index 05863c2..c7fef82 100644 --- a/utils/aes128ecb_encrypt_file.cpp +++ b/utils/aes128ecb_encrypt_file.cpp @@ -37,7 +37,7 @@ namespace int main(int argc, char** argv) { AesNI_Block128 key; - AesNI_Aes128_RoundKeys key_schedule; + AesNI_Aes128_RoundKeys encryption_keys; if (argc != 4) exit_with_usage(); @@ -60,7 +60,7 @@ int main(int argc, char** argv) src_buf.assign(std::istreambuf_iterator(src_ifs), std::istreambuf_iterator()); - aesni_aes128_expand_key(key, &key_schedule); + aesni_aes128_expand_key(key, &encryption_keys); std::size_t dest_size; @@ -69,7 +69,7 @@ int main(int argc, char** argv) src_size, NULL, &dest_size, - &key_schedule, + &encryption_keys, aesni::ErrorDetailsThrowsInDestructor()); std::vector dest_buf; @@ -80,7 +80,7 @@ int main(int argc, char** argv) src_size, dest_buf.data(), &dest_size, - &key_schedule, + &encryption_keys, aesni::ErrorDetailsThrowsInDestructor()); std::ofstream dest_ofs; -- cgit v1.2.3