refactoring

2 files changed, 5 insertions, 5 deletions

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<char>(src_ifs),
                        std::istreambuf_iterator<char>());
 
-        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<char>(src_ifs),
                        std::istreambuf_iterator<char>());
 
-        aesni_expand_key_schedule128(key, &key_schedule);
+        aesni_aes128_expand_key(key, &key_schedule);
 
         std::size_t dest_size;