From 0651133db30c0932877780c2f98901e4ca1072e1 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Wed, 17 Jun 2015 18:29:40 +0300 Subject: refactoring --- utils/aes128ecb_decrypt_file.cpp | 6 +++--- utils/aes128ecb_encrypt_file.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'utils') diff --git a/utils/aes128ecb_decrypt_file.cpp b/utils/aes128ecb_decrypt_file.cpp index 5d9afd2..b2abe8f 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_KeySchedule128 key_schedule, inverted_schedule; + AesNI_Aes128_RoundKeys key_schedule, inverted_schedule; 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_expand_key_schedule128(key, &key_schedule); - aesni_invert_key_schedule128(&key_schedule, &inverted_schedule); + aesni_aes128_expand_key(key, &key_schedule); + aesni_aes128_derive_decryption_keys(&key_schedule, &inverted_schedule); std::size_t dest_size; diff --git a/utils/aes128ecb_encrypt_file.cpp b/utils/aes128ecb_encrypt_file.cpp index a2d13c6..05863c2 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_KeySchedule128 key_schedule; + AesNI_Aes128_RoundKeys key_schedule; 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_expand_key_schedule128(key, &key_schedule); + aesni_aes128_expand_key(key, &key_schedule); std::size_t dest_size; -- cgit v1.2.3