refactoring

3 files changed, 54 insertions, 54 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]);
diff --git a/src/c/aes192.c b/src/c/aes192.c
index fec8f06..c0d410a 100644
--- a/src/c/aes192.c
+++ b/src/c/aes192.c
@@ -11,9 +11,9 @@
 #include <emmintrin.h>
 #include <wmmintrin.h>
 
-AesBlock128 __fastcall raw_aes192_encrypt_block(
-    AesBlock128 plain,
-    Aes192KeySchedule* key_schedule)
+AesNI_Block128 __fastcall aesni_raw_encrypt_block192(
+    AesNI_Block128 plain,
+    AesNI_KeySchedule192* key_schedule)
 {
     plain = _mm_xor_si128(plain, key_schedule->keys[0]);
     plain = _mm_aesenc_si128(plain, key_schedule->keys[1]);
@@ -30,9 +30,9 @@ AesBlock128 __fastcall raw_aes192_encrypt_block(
     return _mm_aesenclast_si128(plain, key_schedule->keys[12]);
 }
 
-AesBlock128 __fastcall raw_aes192_decrypt_block(
-    AesBlock128 cipher,
-    Aes192KeySchedule* inverted_schedule)
+AesNI_Block128 __fastcall aesni_raw_decrypt_block192(
+    AesNI_Block128 cipher,
+    AesNI_KeySchedule192* inverted_schedule)
 {
     cipher = _mm_xor_si128(cipher, inverted_schedule->keys[0]);
     cipher = _mm_aesdec_si128(cipher, inverted_schedule->keys[1]);
@@ -50,11 +50,11 @@ AesBlock128 __fastcall raw_aes192_decrypt_block(
 }
 
 static void __fastcall aes192_keygen_assist(
-    AesBlock128* prev_lo,
-    AesBlock128* prev_hi,
-    AesBlock128 hwgen)
+    AesNI_Block128* prev_lo,
+    AesNI_Block128* prev_hi,
+    AesNI_Block128 hwgen)
 {
-    AesBlock128 tmp = *prev_lo;
+    AesNI_Block128 tmp = *prev_lo;
 
     tmp = _mm_slli_si128(tmp, 4);
     *prev_lo = _mm_xor_si128(*prev_lo, tmp);
@@ -74,10 +74,10 @@ static void __fastcall aes192_keygen_assist(
     *prev_hi = _mm_xor_si128(*prev_hi, tmp);
 }
 
-void __fastcall raw_aes192_expand_key_schedule(
-    AesBlock128 key_lo,
-    AesBlock128 key_hi,
-    Aes192KeySchedule* key_schedule)
+void __fastcall aesni_raw_expand_key_schedule192(
+    AesNI_Block128 key_lo,
+    AesNI_Block128 key_hi,
+    AesNI_KeySchedule192* key_schedule)
 {
     key_schedule->keys[0] = key_lo;
     key_schedule->keys[1] = key_hi;
@@ -114,9 +114,9 @@ void __fastcall raw_aes192_expand_key_schedule(
     key_schedule->keys[12] = key_lo;
 }
 
-void __fastcall raw_aes192_invert_key_schedule(
-    Aes192KeySchedule* key_schedule,
-    Aes192KeySchedule* inverted_schedule)
+void __fastcall aesni_raw_invert_key_schedule192(
+    AesNI_KeySchedule192* key_schedule,
+    AesNI_KeySchedule192* inverted_schedule)
 {
     inverted_schedule->keys[0] = key_schedule->keys[12];
     inverted_schedule->keys[1] = _mm_aesimc_si128(key_schedule->keys[11]);
diff --git a/src/c/aes256.c b/src/c/aes256.c
index be4f783..a9042c6 100644
--- a/src/c/aes256.c
+++ b/src/c/aes256.c
@@ -11,9 +11,9 @@
 #include <emmintrin.h>
 #include <wmmintrin.h>
 
-AesBlock128 __fastcall raw_aes256_encrypt_block(
-    AesBlock128 plain,
-    Aes256KeySchedule* key_schedule)
+AesNI_Block128 __fastcall aesni_raw_encrypt_block256(
+    AesNI_Block128 plain,
+    AesNI_KeySchedule256* key_schedule)
 {
     plain = _mm_xor_si128(plain, key_schedule->keys[0]);
     plain = _mm_aesenc_si128(plain, key_schedule->keys[1]);
@@ -32,9 +32,9 @@ AesBlock128 __fastcall raw_aes256_encrypt_block(
     return _mm_aesenclast_si128(plain, key_schedule->keys[14]);
 }
 
-AesBlock128 __fastcall raw_aes256_decrypt_block(
-    AesBlock128 cipher,
-    Aes256KeySchedule* inverted_schedule)
+AesNI_Block128 __fastcall aesni_raw_decrypt_block256(
+    AesNI_Block128 cipher,
+    AesNI_KeySchedule256* inverted_schedule)
 {
     cipher = _mm_xor_si128(cipher, inverted_schedule->keys[0]);
     cipher = _mm_aesdec_si128(cipher, inverted_schedule->keys[1]);
@@ -53,12 +53,12 @@ AesBlock128 __fastcall raw_aes256_decrypt_block(
     return _mm_aesdeclast_si128(cipher, inverted_schedule->keys[14]);
 }
 
-static AesBlock128 __fastcall aes256_keygen_assist(
-    AesBlock128* prev_lo,
-    AesBlock128* prev_hi,
-    AesBlock128 hwgen)
+static AesNI_Block128 __fastcall aes256_keygen_assist(
+    AesNI_Block128* prev_lo,
+    AesNI_Block128* prev_hi,
+    AesNI_Block128 hwgen)
 {
-    AesBlock128 tmp = *prev_lo;
+    AesNI_Block128 tmp = *prev_lo;
 
     tmp = _mm_slli_si128(tmp, 4);
     *prev_lo = _mm_xor_si128(*prev_lo, tmp);
@@ -76,13 +76,13 @@ static AesBlock128 __fastcall aes256_keygen_assist(
     return *prev_hi;
 }
 
-void __fastcall raw_aes256_expand_key_schedule(
-    AesBlock128 key_lo,
-    AesBlock128 key_hi,
-    Aes256KeySchedule* key_schedule)
+void __fastcall aesni_raw_expand_key_schedule256(
+    AesNI_Block128 key_lo,
+    AesNI_Block128 key_hi,
+    AesNI_KeySchedule256* key_schedule)
 {
-    AesBlock128 prev_lo, prev_hi;
-    AesBlock128 hwgen;
+    AesNI_Block128 prev_lo, prev_hi;
+    AesNI_Block128 hwgen;
 
     prev_lo = key_schedule->keys[0] = key_lo;
     prev_hi = key_schedule->keys[1] = key_hi;
@@ -140,9 +140,9 @@ void __fastcall raw_aes256_expand_key_schedule(
     key_schedule->keys[14] = aes256_keygen_assist(&prev_lo, &prev_hi, hwgen);
 }
 
-void __fastcall raw_aes256_invert_key_schedule(
-    Aes256KeySchedule* key_schedule,
-    Aes256KeySchedule* inverted_schedule)
+void __fastcall aesni_raw_invert_key_schedule256(
+    AesNI_KeySchedule256* key_schedule,
+    AesNI_KeySchedule256* inverted_schedule)
 {
     inverted_schedule->keys[0] = key_schedule->keys[14];
     inverted_schedule->keys[1] = _mm_aesimc_si128(key_schedule->keys[13]);