1 files changed, 17 insertions, 17 deletions

diff --git a/src/c/aes128.c b/src/c/aes128.c
index d4c609d..ac1b4f5 100644
--- a/src/c/aes128.c
+++ b/src/c/aes128.c
@@ -11,9 +11,9 @@
 #include <emmintrin.h>
 #include <wmmintrin.h>
 
-AesBlock128 __fastcall raw_aes128_encrypt_block(
-    AesBlock128 plain,
-    Aes128KeySchedule* key_schedule)
+AesNI_Block128 __fastcall aesni_raw_encrypt_block128(
+    AesNI_Block128 plain,
+    AesNI_KeySchedule128* key_schedule)
 {
     plain = _mm_xor_si128(plain, key_schedule->keys[0]);
     plain = _mm_aesenc_si128(plain, key_schedule->keys[1]);
@@ -28,9 +28,9 @@ AesBlock128 __fastcall raw_aes128_encrypt_block(
     return _mm_aesenclast_si128(plain, key_schedule->keys[10]);
 }
 
-AesBlock128 __fastcall raw_aes128_decrypt_block(
-    AesBlock128 cipher,
-    Aes128KeySchedule* inverted_schedule)
+AesNI_Block128 __fastcall aesni_raw_decrypt_block128(
+    AesNI_Block128 cipher,
+    AesNI_KeySchedule128* inverted_schedule)
 {
     cipher = _mm_xor_si128(cipher, inverted_schedule->keys[0]);
     cipher = _mm_aesdec_si128(cipher, inverted_schedule->keys[1]);
@@ -45,11 +45,11 @@ AesBlock128 __fastcall raw_aes128_decrypt_block(
     return _mm_aesdeclast_si128(cipher, inverted_schedule->keys[10]);
 }
 
-static AesBlock128 __fastcall aes128_keygen_assist(
-    AesBlock128 prev,
-    AesBlock128 hwgen)
+static AesNI_Block128 __fastcall aes128_keygen_assist(
+    AesNI_Block128 prev,
+    AesNI_Block128 hwgen)
 {
-    AesBlock128 tmp = prev;
+    AesNI_Block128 tmp = prev;
 
     tmp = _mm_slli_si128(tmp, 4);
     prev = _mm_xor_si128(prev, tmp);
@@ -64,11 +64,11 @@ static AesBlock128 __fastcall aes128_keygen_assist(
     return prev;
 }
 
-void __fastcall raw_aes128_expand_key_schedule(
-    AesBlock128 key,
-    Aes128KeySchedule* key_schedule)
+void __fastcall aesni_raw_expand_key_schedule128(
+    AesNI_Block128 key,
+    AesNI_KeySchedule128* key_schedule)
 {
-    AesBlock128 prev = key_schedule->keys[0] = key;
+    AesNI_Block128 prev = key_schedule->keys[0] = key;
     prev = key_schedule->keys[1] = aes128_keygen_assist(prev, _mm_aeskeygenassist_si128(prev, 0x01));
     prev = key_schedule->keys[2] = aes128_keygen_assist(prev, _mm_aeskeygenassist_si128(prev, 0x02));
     prev = key_schedule->keys[3] = aes128_keygen_assist(prev, _mm_aeskeygenassist_si128(prev, 0x04));
@@ -81,9 +81,9 @@ void __fastcall raw_aes128_expand_key_schedule(
     prev = key_schedule->keys[10] = aes128_keygen_assist(prev, _mm_aeskeygenassist_si128(prev, 0x36));
 }
 
-void __fastcall raw_aes128_invert_key_schedule(
-    Aes128KeySchedule* key_schedule,
-    Aes128KeySchedule* inverted_schedule)
+void __fastcall aesni_raw_invert_key_schedule128(
+    AesNI_KeySchedule128* key_schedule,
+    AesNI_KeySchedule128* inverted_schedule)
 {
     inverted_schedule->keys[0] = key_schedule->keys[10];
     inverted_schedule->keys[1] = _mm_aesimc_si128(key_schedule->keys[9]);