aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/include/aesni/aes.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--include/aesni/aes.h503
1 files changed, 321 insertions, 182 deletions
diff --git a/include/aesni/aes.h b/include/aesni/aes.h
index 427ca85..ea859a3 100644
--- a/include/aesni/aes.h
+++ b/include/aesni/aes.h
@@ -19,276 +19,415 @@ extern "C"
{
#endif
-typedef AesNI_Block128 AesNI_Aes_Block;
+typedef AesNI_Block128 AesNI_AES_Block;
+typedef AesNI_AES_Block AesNI_AES128_Block;
+typedef AesNI_AES_Block AesNI_AES192_Block;
+typedef AesNI_AES_Block AesNI_AES256_Block;
typedef struct
{
- AesNI_Aes_Block key;
+ AesNI_AES_Block key;
}
-AesNI_Aes128_Key;
+AesNI_AES128_Key;
typedef struct
{
- AesNI_Aes_Block hi;
- AesNI_Aes_Block lo;
+ AesNI_AES_Block hi;
+ AesNI_AES_Block lo;
}
-AesNI_Aes192_Key;
+AesNI_AES192_Key;
typedef struct
{
- AesNI_Aes_Block hi;
- AesNI_Aes_Block lo;
+ AesNI_AES_Block hi;
+ AesNI_AES_Block lo;
}
-AesNI_Aes256_Key;
+AesNI_AES256_Key;
-static __inline void aesni_aes_make_block(AesNI_Aes_Block* dest, int hi3, int hi2, int lo1, int lo0)
+static __inline void aesni_AES_make_block(AesNI_AES_Block* dest, int hi3, int hi2, int lo1, int lo0)
{
*dest = aesni_make_block128(hi3, hi2, lo1, lo0);
}
-static __inline void aesni_aes128_make_key(AesNI_Aes128_Key* dest, int hi3, int hi2, int lo1, int lo0)
+static __inline void aesni_AES128_make_block(AesNI_AES128_Block* dest, int hi3, int hi2, int lo1, int lo0)
{
- dest->key = aesni_make_block128(hi3, hi2, lo1, lo0);
+ aesni_AES_make_block(dest, hi3, hi2, lo1, lo0);
}
-static __inline void aesni_aes192_make_key(AesNI_Aes192_Key* dest, int hi5, int hi4, int lo3, int lo2, int lo1, int lo0)
+static __inline void aesni_AES192_make_block(AesNI_AES192_Block* dest, int hi3, int hi2, int lo1, int lo0)
{
- dest->hi = aesni_make_block128(0, 0, hi5, hi4);
- dest->lo = aesni_make_block128(lo3, lo2, lo1, lo0);
+ aesni_AES_make_block(dest, hi3, hi2, lo1, lo0);
}
-static __inline void aesni_aes256_make_key(AesNI_Aes256_Key* dest, int hi7, int hi6, int hi5, int hi4, int lo3, int lo2, int lo1, int lo0)
+static __inline void aesni_AES256_make_block(AesNI_AES256_Block* dest, int hi3, int hi2, int lo1, int lo0)
{
- dest->hi = aesni_make_block128(hi7, hi6, hi5, hi4);
- dest->lo = aesni_make_block128(lo3, lo2, lo1, lo0);
+ aesni_AES_make_block(dest, hi3, hi2, lo1, lo0);
}
-typedef struct { char str[33]; } AesNI_Aes_BlockString;
-typedef struct { char str[49]; } AesNI_Aes_BlockMatrixString;
+static __inline void aesni_AES128_make_key(AesNI_AES128_Key* dest, int hi3, int hi2, int lo1, int lo0)
+{
+ aesni_AES_make_block(&dest->key, hi3, hi2, lo1, lo0);
+}
+
+static __inline void aesni_AES192_make_key(AesNI_AES192_Key* dest, int hi5, int hi4, int lo3, int lo2, int lo1, int lo0)
+{
+ aesni_AES_make_block(&dest->hi, 0, 0, hi5, hi4);
+ aesni_AES_make_block(&dest->lo, lo3, lo2, lo1, lo0);
+}
+
+static __inline void aesni_AES256_make_key(AesNI_AES256_Key* dest, int hi7, int hi6, int hi5, int hi4, int lo3, int lo2, int lo1, int lo0)
+{
+ aesni_AES_make_block(&dest->hi, hi7, hi6, hi5, hi4);
+ aesni_AES_make_block(&dest->lo, lo3, lo2, lo1, lo0);
+}
-AesNI_StatusCode aesni_aes_format_block(
- AesNI_Aes_BlockString*,
- const AesNI_Aes_Block*,
+typedef struct { char str[33]; } AesNI_AES_BlockString;
+typedef AesNI_AES_BlockString AesNI_AES128_BlockString;
+typedef AesNI_AES_BlockString AesNI_AES192_BlockString;
+typedef AesNI_AES_BlockString AesNI_AES256_BlockString;
+
+typedef struct { char str[49]; } AesNI_AES_BlockMatrixString;
+typedef AesNI_AES_BlockMatrixString AesNI_AES128_BlockMatrixString;
+typedef AesNI_AES_BlockMatrixString AesNI_AES192_BlockMatrixString;
+typedef AesNI_AES_BlockMatrixString AesNI_AES256_BlockMatrixString;
+
+AesNI_StatusCode aesni_AES_format_block(
+ AesNI_AES_BlockString*,
+ const AesNI_AES_Block*,
AesNI_ErrorDetails*);
-AesNI_StatusCode aesni_aes_format_block_as_matrix(
- AesNI_Aes_BlockMatrixString*,
- const AesNI_Aes_Block*,
+static __inline AesNI_StatusCode aesni_AES128_format_block(
+ AesNI_AES128_BlockString* dest,
+ const AesNI_AES128_Block* src,
+ AesNI_ErrorDetails* err_details)
+{
+ return aesni_AES_format_block(dest, src, err_details);
+}
+
+static __inline AesNI_StatusCode aesni_AES192_format_block(
+ AesNI_AES192_BlockString* dest,
+ const AesNI_AES192_Block* src,
+ AesNI_ErrorDetails* err_details)
+{
+ return aesni_AES_format_block(dest, src, err_details);
+}
+
+static __inline AesNI_StatusCode aesni_AES256_format_block(
+ AesNI_AES256_BlockString* dest,
+ const AesNI_AES256_Block* src,
+ AesNI_ErrorDetails* err_details)
+{
+ return aesni_AES_format_block(dest, src, err_details);
+}
+
+AesNI_StatusCode aesni_AES_format_block_as_matrix(
+ AesNI_AES_BlockMatrixString*,
+ const AesNI_AES_Block*,
AesNI_ErrorDetails*);
-AesNI_StatusCode aesni_aes_print_block(
- const AesNI_Aes_Block*,
+static __inline AesNI_StatusCode aesni_AES128_format_block_as_matrix(
+ AesNI_AES128_BlockMatrixString* dest,
+ const AesNI_AES128_Block* src,
+ AesNI_ErrorDetails* err_details)
+{
+ return aesni_AES_format_block_as_matrix(dest, src, err_details);
+}
+
+static __inline AesNI_StatusCode aesni_AES192_format_block_as_matrix(
+ AesNI_AES192_BlockMatrixString* dest,
+ const AesNI_AES192_Block* src,
+ AesNI_ErrorDetails* err_details)
+{
+ return aesni_AES_format_block_as_matrix(dest, src, err_details);
+}
+
+static __inline AesNI_StatusCode aesni_AES256_format_block_as_matrix(
+ AesNI_AES256_BlockMatrixString* dest,
+ const AesNI_AES256_Block* src,
+ AesNI_ErrorDetails* err_details)
+{
+ return aesni_AES_format_block_as_matrix(dest, src, err_details);
+}
+
+AesNI_StatusCode aesni_AES_print_block(
+ const AesNI_AES_Block*,
AesNI_ErrorDetails*);
-AesNI_StatusCode aesni_aes_print_block_as_matrix(
- const AesNI_Aes_Block*,
+static __inline AesNI_StatusCode aesni_AES128_print_block(
+ const AesNI_AES128_Block* block,
+ AesNI_ErrorDetails* err_details)
+{
+ return aesni_AES_print_block(block, err_details);
+}
+
+static __inline AesNI_StatusCode aesni_AES192_print_block(
+ const AesNI_AES192_Block* block,
+ AesNI_ErrorDetails* err_details)
+{
+ return aesni_AES_print_block(block, err_details);
+}
+
+static __inline AesNI_StatusCode aesni_AES256_print_block(
+ const AesNI_AES256_Block* block,
+ AesNI_ErrorDetails* err_details)
+{
+ return aesni_AES_print_block(block, err_details);
+}
+
+AesNI_StatusCode aesni_AES_print_block_as_matrix(
+ const AesNI_AES_Block*,
AesNI_ErrorDetails*);
-AesNI_StatusCode aesni_aes_parse_block(
- AesNI_Aes_Block* dest,
+static __inline AesNI_StatusCode aesni_AES128_print_block_as_matrix(
+ const AesNI_AES128_Block* block,
+ AesNI_ErrorDetails* err_details)
+{
+ return aesni_AES_print_block_as_matrix(block, err_details);
+}
+
+static __inline AesNI_StatusCode aesni_AES192_print_block_as_matrix(
+ const AesNI_AES192_Block* block,
+ AesNI_ErrorDetails* err_details)
+{
+ return aesni_AES_print_block_as_matrix(block, err_details);
+}
+
+static __inline AesNI_StatusCode aesni_AES256_print_block_as_matrix(
+ const AesNI_AES256_Block* block,
+ AesNI_ErrorDetails* err_details)
+{
+ return aesni_AES_print_block_as_matrix(block, err_details);
+}
+
+AesNI_StatusCode aesni_AES_parse_block(
+ AesNI_AES_Block* dest,
const char* src,
AesNI_ErrorDetails* err_details);
-typedef AesNI_Aes_BlockString AesNI_Aes128_KeyString;
-typedef struct { char str[49]; } AesNI_Aes192_KeyString;
-typedef struct { char str[65]; } AesNI_Aes256_KeyString;
+static __inline AesNI_StatusCode aesni_AES128_parse_block(
+ AesNI_AES128_Block* dest,
+ const char* src,
+ AesNI_ErrorDetails* err_details)
+{
+ return aesni_AES_parse_block(dest, src, err_details);
+}
+
+static __inline AesNI_StatusCode aesni_AES192_parse_block(
+ AesNI_AES192_Block* dest,
+ const char* src,
+ AesNI_ErrorDetails* err_details)
+{
+ return aesni_AES_parse_block(dest, src, err_details);
+}
-AesNI_StatusCode aesni_aes128_format_key(
- AesNI_Aes128_KeyString*,
- const AesNI_Aes128_Key*,
+static __inline AesNI_StatusCode aesni_AES256_parse_block(
+ AesNI_AES256_Block* dest,
+ const char* src,
+ AesNI_ErrorDetails* err_details)
+{
+ return aesni_AES_parse_block(dest, src, err_details);
+}
+
+typedef struct { char str[33]; } AesNI_AES128_KeyString;
+typedef struct { char str[49]; } AesNI_AES192_KeyString;
+typedef struct { char str[65]; } AesNI_AES256_KeyString;
+
+AesNI_StatusCode aesni_AES128_format_key(
+ AesNI_AES128_KeyString*,
+ const AesNI_AES128_Key*,
AesNI_ErrorDetails*);
-AesNI_StatusCode aesni_aes192_format_key(
- AesNI_Aes192_KeyString*,
- const AesNI_Aes192_Key*,
+AesNI_StatusCode aesni_AES192_format_key(
+ AesNI_AES192_KeyString*,
+ const AesNI_AES192_Key*,
AesNI_ErrorDetails*);
-AesNI_StatusCode aesni_aes256_format_key(
- AesNI_Aes256_KeyString*,
- const AesNI_Aes256_Key*,
+AesNI_StatusCode aesni_AES256_format_key(
+ AesNI_AES256_KeyString*,
+ const AesNI_AES256_Key*,
AesNI_ErrorDetails*);
-AesNI_StatusCode aesni_aes128_print_key(
- const AesNI_Aes128_Key*,
+AesNI_StatusCode aesni_AES128_print_key(
+ const AesNI_AES128_Key*,
AesNI_ErrorDetails*);
-AesNI_StatusCode aesni_aes192_print_key(
- const AesNI_Aes192_Key*,
+AesNI_StatusCode aesni_AES192_print_key(
+ const AesNI_AES192_Key*,
AesNI_ErrorDetails*);
-AesNI_StatusCode aesni_aes256_print_key(
- const AesNI_Aes256_Key*,
+AesNI_StatusCode aesni_AES256_print_key(
+ const AesNI_AES256_Key*,
AesNI_ErrorDetails*);
-AesNI_StatusCode aesni_aes128_parse_key(
- AesNI_Aes128_Key* dest,
+AesNI_StatusCode aesni_AES128_parse_key(
+ AesNI_AES128_Key* dest,
const char* src,
AesNI_ErrorDetails* err_details);
-AesNI_StatusCode aesni_aes192_parse_key(
- AesNI_Aes192_Key* dest,
+AesNI_StatusCode aesni_AES192_parse_key(
+ AesNI_AES192_Key* dest,
const char* src,
AesNI_ErrorDetails* err_details);
-AesNI_StatusCode aesni_aes256_parse_key(
- AesNI_Aes256_Key* dest,
+AesNI_StatusCode aesni_AES256_parse_key(
+ AesNI_AES256_Key* dest,
const char* src,
AesNI_ErrorDetails* err_details);
typedef struct
{
- AesNI_Aes_Block keys[11];
+ AesNI_AES_Block keys[11];
}
-AesNI_Aes128_RoundKeys;
+AesNI_AES128_RoundKeys;
typedef struct
{
- AesNI_Aes_Block keys[13];
+ AesNI_AES_Block keys[13];
}
-AesNI_Aes192_RoundKeys;
+AesNI_AES192_RoundKeys;
typedef struct
{
- AesNI_Aes_Block keys[15];
+ AesNI_AES_Block keys[15];
}
-AesNI_Aes256_RoundKeys;
+AesNI_AES256_RoundKeys;
-void __fastcall aesni_aes128_expand_key_(
- AesNI_Aes_Block key,
- AesNI_Aes128_RoundKeys* encryption_keys);
+void __fastcall aesni_AES128_expand_key_(
+ AesNI_AES_Block key,
+ AesNI_AES128_RoundKeys* encryption_keys);
-void __fastcall aesni_aes192_expand_key_(
- AesNI_Aes_Block key_lo,
- AesNI_Aes_Block key_hi,
- AesNI_Aes192_RoundKeys* encryption_keys);
+void __fastcall aesni_AES192_expand_key_(
+ AesNI_AES_Block key_lo,
+ AesNI_AES_Block key_hi,
+ AesNI_AES192_RoundKeys* encryption_keys);
-void __fastcall aesni_aes256_expand_key_(
- AesNI_Aes_Block key_lo,
- AesNI_Aes_Block key_hi,
- AesNI_Aes256_RoundKeys* encryption_keys);
+void __fastcall aesni_AES256_expand_key_(
+ AesNI_AES_Block key_lo,
+ AesNI_AES_Block key_hi,
+ AesNI_AES256_RoundKeys* encryption_keys);
-void __fastcall aesni_aes128_derive_decryption_keys_(
- const AesNI_Aes128_RoundKeys* encryption_keys,
- AesNI_Aes128_RoundKeys* decryption_keys);
+void __fastcall aesni_AES128_derive_decryption_keys_(
+ const AesNI_AES128_RoundKeys* encryption_keys,
+ AesNI_AES128_RoundKeys* decryption_keys);
-void __fastcall aesni_aes192_derive_decryption_keys_(
- const AesNI_Aes192_RoundKeys* encryption_keys,
- AesNI_Aes192_RoundKeys* decryption_keys);
+void __fastcall aesni_AES192_derive_decryption_keys_(
+ const AesNI_AES192_RoundKeys* encryption_keys,
+ AesNI_AES192_RoundKeys* decryption_keys);
-void __fastcall aesni_aes256_derive_decryption_keys_(
- const AesNI_Aes256_RoundKeys* encryption_keys,
- AesNI_Aes256_RoundKeys* decryption_keys);
+void __fastcall aesni_AES256_derive_decryption_keys_(
+ const AesNI_AES256_RoundKeys* encryption_keys,
+ AesNI_AES256_RoundKeys* decryption_keys);
-AesNI_Aes_Block __fastcall aesni_aes128_encrypt_block_(
- AesNI_Aes_Block plaintext,
- const AesNI_Aes128_RoundKeys*);
+AesNI_AES_Block __fastcall aesni_AES128_encrypt_block_(
+ AesNI_AES_Block plaintext,
+ const AesNI_AES128_RoundKeys*);
-AesNI_Aes_Block __fastcall aesni_aes192_encrypt_block_(
- AesNI_Aes_Block plaintext,
- const AesNI_Aes192_RoundKeys*);
+AesNI_AES_Block __fastcall aesni_AES192_encrypt_block_(
+ AesNI_AES_Block plaintext,
+ const AesNI_AES192_RoundKeys*);
-AesNI_Aes_Block __fastcall aesni_aes256_encrypt_block_(
- AesNI_Aes_Block plaintext,
- const AesNI_Aes256_RoundKeys*);
+AesNI_AES_Block __fastcall aesni_AES256_encrypt_block_(
+ AesNI_AES_Block plaintext,
+ const AesNI_AES256_RoundKeys*);
-AesNI_Aes_Block __fastcall aesni_aes128_decrypt_block_(
- AesNI_Aes_Block ciphertext,
- const AesNI_Aes128_RoundKeys*);
+AesNI_AES_Block __fastcall aesni_AES128_decrypt_block_(
+ AesNI_AES_Block ciphertext,
+ const AesNI_AES128_RoundKeys*);
-AesNI_Aes_Block __fastcall aesni_aes192_decrypt_block_(
- AesNI_Aes_Block ciphertext,
- const AesNI_Aes192_RoundKeys*);
+AesNI_AES_Block __fastcall aesni_AES192_decrypt_block_(
+ AesNI_AES_Block ciphertext,
+ const AesNI_AES192_RoundKeys*);
-AesNI_Aes_Block __fastcall aesni_aes256_decrypt_block_(
- AesNI_Aes_Block ciphertext,
- const AesNI_Aes256_RoundKeys*);
+AesNI_AES_Block __fastcall aesni_AES256_decrypt_block_(
+ AesNI_AES_Block ciphertext,
+ const AesNI_AES256_RoundKeys*);
-static __inline AesNI_Aes_Block __fastcall aesni_aes_xor_blocks(
- AesNI_Aes_Block a,
- AesNI_Aes_Block b)
+static __inline AesNI_AES_Block __fastcall aesni_AES_xor_blocks(
+ AesNI_AES_Block a,
+ AesNI_AES_Block b)
{
return aesni_xor_block128(a, b);
}
-static __inline AesNI_Aes_Block __fastcall aesni_aes128_xor_blocks(
- AesNI_Aes_Block a,
- AesNI_Aes_Block b)
+static __inline AesNI_AES_Block __fastcall aesni_AES128_xor_blocks(
+ AesNI_AES128_Block a,
+ AesNI_AES128_Block b)
{
- return aesni_aes_xor_blocks(a, b);
+ return aesni_AES_xor_blocks(a, b);
}
-static __inline AesNI_Aes_Block __fastcall aesni_aes192_xor_blocks(
- AesNI_Aes_Block a,
- AesNI_Aes_Block b)
+static __inline AesNI_AES_Block __fastcall aesni_AES192_xor_blocks(
+ AesNI_AES192_Block a,
+ AesNI_AES192_Block b)
{
- return aesni_aes_xor_blocks(a, b);
+ return aesni_AES_xor_blocks(a, b);
}
-static __inline AesNI_Aes_Block __fastcall aesni_aes256_xor_blocks(
- AesNI_Aes_Block a,
- AesNI_Aes_Block b)
+static __inline AesNI_AES_Block __fastcall aesni_AES256_xor_blocks(
+ AesNI_AES256_Block a,
+ AesNI_AES256_Block b)
{
- return aesni_aes_xor_blocks(a, b);
+ return aesni_AES_xor_blocks(a, b);
}
-static __inline AesNI_Aes_Block __fastcall aesni_aes_inc_block(
- AesNI_Aes_Block block)
+static __inline AesNI_AES_Block __fastcall aesni_AES_inc_block(
+ AesNI_AES_Block block)
{
block = aesni_reverse_byte_order_block128(block);
block = aesni_inc_block128(block);
return aesni_reverse_byte_order_block128(block);
}
-static __inline AesNI_Aes_Block __fastcall aesni_aes128_inc_block(
- AesNI_Aes_Block block)
+static __inline AesNI_AES_Block __fastcall aesni_AES128_inc_block(
+ AesNI_AES128_Block block)
{
- return aesni_aes_inc_block(block);
+ return aesni_AES_inc_block(block);
}
-static __inline AesNI_Aes_Block __fastcall aesni_aes192_inc_block(
- AesNI_Aes_Block block)
+static __inline AesNI_AES_Block __fastcall aesni_AES192_inc_block(
+ AesNI_AES192_Block block)
{
- return aesni_aes_inc_block(block);
+ return aesni_AES_inc_block(block);
}
-static __inline AesNI_Aes_Block __fastcall aesni_aes256_inc_block(
- AesNI_Aes_Block block)
+static __inline AesNI_AES_Block __fastcall aesni_AES256_inc_block(
+ AesNI_AES256_Block block)
{
- return aesni_aes_inc_block(block);
+ return aesni_AES_inc_block(block);
}
-AESNI_ENCRYPT_BLOCK_ECB(aes128, AesNI_Aes_Block, AesNI_Aes128_RoundKeys);
-AESNI_DECRYPT_BLOCK_ECB(aes128, AesNI_Aes_Block, AesNI_Aes128_RoundKeys);
-AESNI_ENCRYPT_BLOCK_CBC(aes128, AesNI_Aes_Block, AesNI_Aes128_RoundKeys);
-AESNI_DECRYPT_BLOCK_CBC(aes128, AesNI_Aes_Block, AesNI_Aes128_RoundKeys);
-AESNI_ENCRYPT_BLOCK_CFB(aes128, AesNI_Aes_Block, AesNI_Aes128_RoundKeys);
-AESNI_DECRYPT_BLOCK_CFB(aes128, AesNI_Aes_Block, AesNI_Aes128_RoundKeys);
-AESNI_ENCRYPT_BLOCK_OFB(aes128, AesNI_Aes_Block, AesNI_Aes128_RoundKeys);
-AESNI_DECRYPT_BLOCK_OFB(aes128, AesNI_Aes_Block, AesNI_Aes128_RoundKeys);
-AESNI_ENCRYPT_BLOCK_CTR(aes128, AesNI_Aes_Block, AesNI_Aes128_RoundKeys);
-AESNI_DECRYPT_BLOCK_CTR(aes128, AesNI_Aes_Block, AesNI_Aes128_RoundKeys);
-
-AESNI_ENCRYPT_BLOCK_ECB(aes192, AesNI_Aes_Block, AesNI_Aes192_RoundKeys);
-AESNI_DECRYPT_BLOCK_ECB(aes192, AesNI_Aes_Block, AesNI_Aes192_RoundKeys);
-AESNI_ENCRYPT_BLOCK_CBC(aes192, AesNI_Aes_Block, AesNI_Aes192_RoundKeys);
-AESNI_DECRYPT_BLOCK_CBC(aes192, AesNI_Aes_Block, AesNI_Aes192_RoundKeys);
-AESNI_ENCRYPT_BLOCK_CFB(aes192, AesNI_Aes_Block, AesNI_Aes192_RoundKeys);
-AESNI_DECRYPT_BLOCK_CFB(aes192, AesNI_Aes_Block, AesNI_Aes192_RoundKeys);
-AESNI_ENCRYPT_BLOCK_OFB(aes192, AesNI_Aes_Block, AesNI_Aes192_RoundKeys);
-AESNI_DECRYPT_BLOCK_OFB(aes192, AesNI_Aes_Block, AesNI_Aes192_RoundKeys);
-AESNI_ENCRYPT_BLOCK_CTR(aes192, AesNI_Aes_Block, AesNI_Aes192_RoundKeys);
-AESNI_DECRYPT_BLOCK_CTR(aes192, AesNI_Aes_Block, AesNI_Aes192_RoundKeys);
-
-AESNI_ENCRYPT_BLOCK_ECB(aes256, AesNI_Aes_Block, AesNI_Aes256_RoundKeys);
-AESNI_DECRYPT_BLOCK_ECB(aes256, AesNI_Aes_Block, AesNI_Aes256_RoundKeys);
-AESNI_ENCRYPT_BLOCK_CBC(aes256, AesNI_Aes_Block, AesNI_Aes256_RoundKeys);
-AESNI_DECRYPT_BLOCK_CBC(aes256, AesNI_Aes_Block, AesNI_Aes256_RoundKeys);
-AESNI_ENCRYPT_BLOCK_CFB(aes256, AesNI_Aes_Block, AesNI_Aes256_RoundKeys);
-AESNI_DECRYPT_BLOCK_CFB(aes256, AesNI_Aes_Block, AesNI_Aes256_RoundKeys);
-AESNI_ENCRYPT_BLOCK_OFB(aes256, AesNI_Aes_Block, AesNI_Aes256_RoundKeys);
-AESNI_DECRYPT_BLOCK_OFB(aes256, AesNI_Aes_Block, AesNI_Aes256_RoundKeys);
-AESNI_ENCRYPT_BLOCK_CTR(aes256, AesNI_Aes_Block, AesNI_Aes256_RoundKeys);
-AESNI_DECRYPT_BLOCK_CTR(aes256, AesNI_Aes_Block, AesNI_Aes256_RoundKeys);
+AESNI_ENCRYPT_BLOCK_ECB(AES128);
+AESNI_DECRYPT_BLOCK_ECB(AES128);
+AESNI_ENCRYPT_BLOCK_CBC(AES128);
+AESNI_DECRYPT_BLOCK_CBC(AES128);
+AESNI_ENCRYPT_BLOCK_CFB(AES128);
+AESNI_DECRYPT_BLOCK_CFB(AES128);
+AESNI_ENCRYPT_BLOCK_OFB(AES128);
+AESNI_DECRYPT_BLOCK_OFB(AES128);
+AESNI_ENCRYPT_BLOCK_CTR(AES128);
+AESNI_DECRYPT_BLOCK_CTR(AES128);
+
+AESNI_ENCRYPT_BLOCK_ECB(AES192);
+AESNI_DECRYPT_BLOCK_ECB(AES192);
+AESNI_ENCRYPT_BLOCK_CBC(AES192);
+AESNI_DECRYPT_BLOCK_CBC(AES192);
+AESNI_ENCRYPT_BLOCK_CFB(AES192);
+AESNI_DECRYPT_BLOCK_CFB(AES192);
+AESNI_ENCRYPT_BLOCK_OFB(AES192);
+AESNI_DECRYPT_BLOCK_OFB(AES192);
+AESNI_ENCRYPT_BLOCK_CTR(AES192);
+AESNI_DECRYPT_BLOCK_CTR(AES192);
+
+AESNI_ENCRYPT_BLOCK_ECB(AES256);
+AESNI_DECRYPT_BLOCK_ECB(AES256);
+AESNI_ENCRYPT_BLOCK_CBC(AES256);
+AESNI_DECRYPT_BLOCK_CBC(AES256);
+AESNI_ENCRYPT_BLOCK_CFB(AES256);
+AESNI_DECRYPT_BLOCK_CFB(AES256);
+AESNI_ENCRYPT_BLOCK_OFB(AES256);
+AESNI_DECRYPT_BLOCK_OFB(AES256);
+AESNI_ENCRYPT_BLOCK_CTR(AES256);
+AESNI_DECRYPT_BLOCK_CTR(AES256);
/**
* \brief Expands an AES-128 key into 10 encryption round keys.
@@ -296,13 +435,13 @@ AESNI_DECRYPT_BLOCK_CTR(aes256, AesNI_Aes_Block, AesNI_Aes256_RoundKeys);
* \param[in] key The AES-128 key.
* \param[out] encryption_keys The AES-128 encryption round keys. Must not be `NULL`.
*/
-static __inline void __fastcall aesni_aes128_expand_key(
- const AesNI_Aes128_Key* key,
- AesNI_Aes128_RoundKeys* encryption_keys)
+static __inline void __fastcall aesni_AES128_expand_key(
+ const AesNI_AES128_Key* key,
+ AesNI_AES128_RoundKeys* encryption_keys)
{
assert(encryption_keys);
- aesni_aes128_expand_key_(key->key, encryption_keys);
+ aesni_AES128_expand_key_(key->key, encryption_keys);
}
/**
@@ -311,14 +450,14 @@ static __inline void __fastcall aesni_aes128_expand_key(
* \param[in] encryption_keys The AES-128 encryption round keys. Must not be `NULL`.
* \param[out] decryption_keys The AES-128 decryption round keys. Must not be `NULL`.
*/
-static __inline void __fastcall aesni_aes128_derive_decryption_keys(
- const AesNI_Aes128_RoundKeys* encryption_keys,
- AesNI_Aes128_RoundKeys* decryption_keys)
+static __inline void __fastcall aesni_AES128_derive_decryption_keys(
+ const AesNI_AES128_RoundKeys* encryption_keys,
+ AesNI_AES128_RoundKeys* decryption_keys)
{
assert(encryption_keys);
assert(decryption_keys);
- aesni_aes128_derive_decryption_keys_(encryption_keys, decryption_keys);
+ aesni_AES128_derive_decryption_keys_(encryption_keys, decryption_keys);
}
/**
@@ -327,14 +466,14 @@ static __inline void __fastcall aesni_aes128_derive_decryption_keys(
* \param[in] key The AES-192 key.
* \param[out] encryption_keys The AES-192 encryption round keys. Must not be `NULL`.
*/
-static __inline void __fastcall aesni_aes192_expand_key(
- const AesNI_Aes192_Key* key,
- AesNI_Aes192_RoundKeys* encryption_keys)
+static __inline void __fastcall aesni_AES192_expand_key(
+ const AesNI_AES192_Key* key,
+ AesNI_AES192_RoundKeys* encryption_keys)
{
assert(key);
assert(encryption_keys);
- aesni_aes192_expand_key_(key->lo, key->hi, encryption_keys);
+ aesni_AES192_expand_key_(key->lo, key->hi, encryption_keys);
}
/**
@@ -343,14 +482,14 @@ static __inline void __fastcall aesni_aes192_expand_key(
* \param[in] encryption_keys The AES-192 encryption round keys. Must not be `NULL`.
* \param[out] decryption_keys The AES-192 decryption round keys. Must not be `NULL`.
*/
-static __inline void __fastcall aesni_aes192_derive_decryption_keys(
- const AesNI_Aes192_RoundKeys* encryption_keys,
- AesNI_Aes192_RoundKeys* decryption_keys)
+static __inline void __fastcall aesni_AES192_derive_decryption_keys(
+ const AesNI_AES192_RoundKeys* encryption_keys,
+ AesNI_AES192_RoundKeys* decryption_keys)
{
assert(encryption_keys);
assert(decryption_keys);
- aesni_aes192_derive_decryption_keys_(encryption_keys, decryption_keys);
+ aesni_AES192_derive_decryption_keys_(encryption_keys, decryption_keys);
}
/**
@@ -359,14 +498,14 @@ static __inline void __fastcall aesni_aes192_derive_decryption_keys(
* \param[in] key The AES-256 key.
* \param[out] encryption_keys The AES-256 encryption round keys. Must not be `NULL`.
*/
-static __inline void __fastcall aesni_aes256_expand_key(
- const AesNI_Aes256_Key* key,
- AesNI_Aes256_RoundKeys* encryption_keys)
+static __inline void __fastcall aesni_AES256_expand_key(
+ const AesNI_AES256_Key* key,
+ AesNI_AES256_RoundKeys* encryption_keys)
{
assert(key);
assert(encryption_keys);
- aesni_aes256_expand_key_(key->lo, key->hi, encryption_keys);
+ aesni_AES256_expand_key_(key->lo, key->hi, encryption_keys);
}
/**
@@ -375,14 +514,14 @@ static __inline void __fastcall aesni_aes256_expand_key(
* \param[in] encryption_keys The AES-256 encryption round keys. Must not be `NULL`.
* \param[out] decryption_keys The AES-256 decryption round keys. Must not be `NULL`.
*/
-static __inline void __fastcall aesni_aes256_derive_decryption_keys(
- const AesNI_Aes256_RoundKeys* encryption_keys,
- AesNI_Aes256_RoundKeys* decryption_keys)
+static __inline void __fastcall aesni_AES256_derive_decryption_keys(
+ const AesNI_AES256_RoundKeys* encryption_keys,
+ AesNI_AES256_RoundKeys* decryption_keys)
{
assert(encryption_keys);
assert(decryption_keys);
- aesni_aes256_derive_decryption_keys_(encryption_keys, decryption_keys);
+ aesni_AES256_derive_decryption_keys_(encryption_keys, decryption_keys);
}
#ifdef __cplusplus