fix function names

3 files changed, 34 insertions, 34 deletions

diff --git a/aes/src/c/aes128.c b/aes/src/c/aes128.c
index cf78722..909b208 100644
--- a/aes/src/c/aes128.c
+++ b/aes/src/c/aes128.c
@@ -44,7 +44,7 @@ AES_Block __fastcall aes128_decrypt_block_(
     return _mm_aesdeclast_si128(ciphertext, decryption_keys->keys[10]);
 }
 
-static AES_Block __fastcall aes_aes128_expand_key_assist(AES_Block prev, AES_Block hwgen) {
+static AES_Block __fastcall aes128_expand_key_assist(AES_Block prev, AES_Block hwgen) {
     AES_Block tmp = prev;
 
     tmp = _mm_slli_si128(tmp, 4);
@@ -63,25 +63,25 @@ static AES_Block __fastcall aes_aes128_expand_key_assist(AES_Block prev, AES_Blo
 void __fastcall aes128_expand_key_(AES_Block key, AES128_RoundKeys* encryption_keys) {
     AES_Block prev = encryption_keys->keys[0] = key;
     prev = encryption_keys->keys[1] =
-        aes_aes128_expand_key_assist(prev, _mm_aeskeygenassist_si128(prev, 0x01));
+        aes128_expand_key_assist(prev, _mm_aeskeygenassist_si128(prev, 0x01));
     prev = encryption_keys->keys[2] =
-        aes_aes128_expand_key_assist(prev, _mm_aeskeygenassist_si128(prev, 0x02));
+        aes128_expand_key_assist(prev, _mm_aeskeygenassist_si128(prev, 0x02));
     prev = encryption_keys->keys[3] =
-        aes_aes128_expand_key_assist(prev, _mm_aeskeygenassist_si128(prev, 0x04));
+        aes128_expand_key_assist(prev, _mm_aeskeygenassist_si128(prev, 0x04));
     prev = encryption_keys->keys[4] =
-        aes_aes128_expand_key_assist(prev, _mm_aeskeygenassist_si128(prev, 0x08));
+        aes128_expand_key_assist(prev, _mm_aeskeygenassist_si128(prev, 0x08));
     prev = encryption_keys->keys[5] =
-        aes_aes128_expand_key_assist(prev, _mm_aeskeygenassist_si128(prev, 0x10));
+        aes128_expand_key_assist(prev, _mm_aeskeygenassist_si128(prev, 0x10));
     prev = encryption_keys->keys[6] =
-        aes_aes128_expand_key_assist(prev, _mm_aeskeygenassist_si128(prev, 0x20));
+        aes128_expand_key_assist(prev, _mm_aeskeygenassist_si128(prev, 0x20));
     prev = encryption_keys->keys[7] =
-        aes_aes128_expand_key_assist(prev, _mm_aeskeygenassist_si128(prev, 0x40));
+        aes128_expand_key_assist(prev, _mm_aeskeygenassist_si128(prev, 0x40));
     prev = encryption_keys->keys[8] =
-        aes_aes128_expand_key_assist(prev, _mm_aeskeygenassist_si128(prev, 0x80));
+        aes128_expand_key_assist(prev, _mm_aeskeygenassist_si128(prev, 0x80));
     prev = encryption_keys->keys[9] =
-        aes_aes128_expand_key_assist(prev, _mm_aeskeygenassist_si128(prev, 0x1b));
+        aes128_expand_key_assist(prev, _mm_aeskeygenassist_si128(prev, 0x1b));
     prev = encryption_keys->keys[10] =
-        aes_aes128_expand_key_assist(prev, _mm_aeskeygenassist_si128(prev, 0x36));
+        aes128_expand_key_assist(prev, _mm_aeskeygenassist_si128(prev, 0x36));
 }
 
 void __fastcall aes128_derive_decryption_keys_(
diff --git a/aes/src/c/aes192.c b/aes/src/c/aes192.c
index d257df7..b5f1103 100644
--- a/aes/src/c/aes192.c
+++ b/aes/src/c/aes192.c
@@ -48,7 +48,7 @@ AES_Block __fastcall aes192_decrypt_block_(
     return _mm_aesdeclast_si128(ciphertext, decryption_keys->keys[12]);
 }
 
-static void __fastcall aes_aes192_expand_key_assist(
+static void __fastcall aes192_expand_key_assist(
     AES_Block* prev_lo,
     AES_Block* prev_hi,
     AES_Block hwgen
@@ -81,47 +81,47 @@ void __fastcall aes192_expand_key_(
     encryption_keys->keys[0] = key_lo;
     encryption_keys->keys[1] = key_hi;
 
-    aes_aes192_expand_key_assist(&key_lo, &key_hi, _mm_aeskeygenassist_si128(key_hi, 0x01));
+    aes192_expand_key_assist(&key_lo, &key_hi, _mm_aeskeygenassist_si128(key_hi, 0x01));
     encryption_keys->keys[1] = _mm_castpd_si128(
         _mm_shuffle_pd(_mm_castsi128_pd(encryption_keys->keys[1]), _mm_castsi128_pd(key_lo), 0)
     );
     encryption_keys->keys[2] =
         _mm_castpd_si128(_mm_shuffle_pd(_mm_castsi128_pd(key_lo), _mm_castsi128_pd(key_hi), 1));
 
-    aes_aes192_expand_key_assist(&key_lo, &key_hi, _mm_aeskeygenassist_si128(key_hi, 0x02));
+    aes192_expand_key_assist(&key_lo, &key_hi, _mm_aeskeygenassist_si128(key_hi, 0x02));
     encryption_keys->keys[3] = key_lo;
     encryption_keys->keys[4] = key_hi;
 
-    aes_aes192_expand_key_assist(&key_lo, &key_hi, _mm_aeskeygenassist_si128(key_hi, 0x04));
+    aes192_expand_key_assist(&key_lo, &key_hi, _mm_aeskeygenassist_si128(key_hi, 0x04));
     encryption_keys->keys[4] = _mm_castpd_si128(
         _mm_shuffle_pd(_mm_castsi128_pd(encryption_keys->keys[4]), _mm_castsi128_pd(key_lo), 0)
     );
     encryption_keys->keys[5] =
         _mm_castpd_si128(_mm_shuffle_pd(_mm_castsi128_pd(key_lo), _mm_castsi128_pd(key_hi), 1));
 
-    aes_aes192_expand_key_assist(&key_lo, &key_hi, _mm_aeskeygenassist_si128(key_hi, 0x08));
+    aes192_expand_key_assist(&key_lo, &key_hi, _mm_aeskeygenassist_si128(key_hi, 0x08));
     encryption_keys->keys[6] = key_lo;
     encryption_keys->keys[7] = key_hi;
 
-    aes_aes192_expand_key_assist(&key_lo, &key_hi, _mm_aeskeygenassist_si128(key_hi, 0x10));
+    aes192_expand_key_assist(&key_lo, &key_hi, _mm_aeskeygenassist_si128(key_hi, 0x10));
     encryption_keys->keys[7] = _mm_castpd_si128(
         _mm_shuffle_pd(_mm_castsi128_pd(encryption_keys->keys[7]), _mm_castsi128_pd(key_lo), 0)
     );
     encryption_keys->keys[8] =
         _mm_castpd_si128(_mm_shuffle_pd(_mm_castsi128_pd(key_lo), _mm_castsi128_pd(key_hi), 1));
 
-    aes_aes192_expand_key_assist(&key_lo, &key_hi, _mm_aeskeygenassist_si128(key_hi, 0x20));
+    aes192_expand_key_assist(&key_lo, &key_hi, _mm_aeskeygenassist_si128(key_hi, 0x20));
     encryption_keys->keys[9] = key_lo;
     encryption_keys->keys[10] = key_hi;
 
-    aes_aes192_expand_key_assist(&key_lo, &key_hi, _mm_aeskeygenassist_si128(key_hi, 0x40));
+    aes192_expand_key_assist(&key_lo, &key_hi, _mm_aeskeygenassist_si128(key_hi, 0x40));
     encryption_keys->keys[10] = _mm_castpd_si128(
         _mm_shuffle_pd(_mm_castsi128_pd(encryption_keys->keys[10]), _mm_castsi128_pd(key_lo), 0)
     );
     encryption_keys->keys[11] =
         _mm_castpd_si128(_mm_shuffle_pd(_mm_castsi128_pd(key_lo), _mm_castsi128_pd(key_hi), 1));
 
-    aes_aes192_expand_key_assist(&key_lo, &key_hi, _mm_aeskeygenassist_si128(key_hi, 0x80));
+    aes192_expand_key_assist(&key_lo, &key_hi, _mm_aeskeygenassist_si128(key_hi, 0x80));
     encryption_keys->keys[12] = key_lo;
 }
 
diff --git a/aes/src/c/aes256.c b/aes/src/c/aes256.c
index f1b5aef..cc5e13e 100644
--- a/aes/src/c/aes256.c
+++ b/aes/src/c/aes256.c
@@ -52,7 +52,7 @@ AES_Block __fastcall aes256_decrypt_block_(
     return _mm_aesdeclast_si128(ciphertext, decryption_keys->keys[14]);
 }
 
-static AES_Block __fastcall aes_aes256_expand_key_assist(
+static AES_Block __fastcall aes256_expand_key_assist(
     AES_Block* prev_lo,
     AES_Block* prev_hi,
     AES_Block hwgen
@@ -88,55 +88,55 @@ void __fastcall aes256_expand_key_(
 
     hwgen = _mm_aeskeygenassist_si128(prev_hi, 0x01);
     hwgen = _mm_shuffle_epi32(hwgen, 0xff);
-    encryption_keys->keys[2] = aes_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen);
+    encryption_keys->keys[2] = aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen);
 
     hwgen = _mm_aeskeygenassist_si128(prev_hi, 0);
     hwgen = _mm_shuffle_epi32(hwgen, 0xaa);
-    encryption_keys->keys[3] = aes_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen);
+    encryption_keys->keys[3] = aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen);
 
     hwgen = _mm_aeskeygenassist_si128(prev_hi, 0x02);
     hwgen = _mm_shuffle_epi32(hwgen, 0xff);
-    encryption_keys->keys[4] = aes_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen);
+    encryption_keys->keys[4] = aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen);
 
     hwgen = _mm_aeskeygenassist_si128(prev_hi, 0);
     hwgen = _mm_shuffle_epi32(hwgen, 0xaa);
-    encryption_keys->keys[5] = aes_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen);
+    encryption_keys->keys[5] = aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen);
 
     hwgen = _mm_aeskeygenassist_si128(prev_hi, 0x04);
     hwgen = _mm_shuffle_epi32(hwgen, 0xff);
-    encryption_keys->keys[6] = aes_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen);
+    encryption_keys->keys[6] = aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen);
 
     hwgen = _mm_aeskeygenassist_si128(prev_hi, 0);
     hwgen = _mm_shuffle_epi32(hwgen, 0xaa);
-    encryption_keys->keys[7] = aes_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen);
+    encryption_keys->keys[7] = aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen);
 
     hwgen = _mm_aeskeygenassist_si128(prev_hi, 0x08);
     hwgen = _mm_shuffle_epi32(hwgen, 0xff);
-    encryption_keys->keys[8] = aes_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen);
+    encryption_keys->keys[8] = aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen);
 
     hwgen = _mm_aeskeygenassist_si128(prev_hi, 0);
     hwgen = _mm_shuffle_epi32(hwgen, 0xaa);
-    encryption_keys->keys[9] = aes_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen);
+    encryption_keys->keys[9] = aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen);
 
     hwgen = _mm_aeskeygenassist_si128(prev_hi, 0x10);
     hwgen = _mm_shuffle_epi32(hwgen, 0xff);
-    encryption_keys->keys[10] = aes_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen);
+    encryption_keys->keys[10] = aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen);
 
     hwgen = _mm_aeskeygenassist_si128(prev_hi, 0);
     hwgen = _mm_shuffle_epi32(hwgen, 0xaa);
-    encryption_keys->keys[11] = aes_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen);
+    encryption_keys->keys[11] = aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen);
 
     hwgen = _mm_aeskeygenassist_si128(prev_hi, 0x20);
     hwgen = _mm_shuffle_epi32(hwgen, 0xff);
-    encryption_keys->keys[12] = aes_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen);
+    encryption_keys->keys[12] = aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen);
 
     hwgen = _mm_aeskeygenassist_si128(prev_hi, 0);
     hwgen = _mm_shuffle_epi32(hwgen, 0xaa);
-    encryption_keys->keys[13] = aes_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen);
+    encryption_keys->keys[13] = aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen);
 
     hwgen = _mm_aeskeygenassist_si128(prev_hi, 0x40);
     hwgen = _mm_shuffle_epi32(hwgen, 0xff);
-    encryption_keys->keys[14] = aes_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen);
+    encryption_keys->keys[14] = aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen);
 }
 
 void __fastcall aes256_derive_decryption_keys_(