From 53dfe511dc29beb8d399e95dfa93b6d3baed6b57 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Tue, 28 Jul 2015 21:34:15 +0300 Subject: refactoring Namely, rename API functions to facilitate metaprogramming using preprocessor macros. --- src/c/aes128.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'src/c/aes128.c') diff --git a/src/c/aes128.c b/src/c/aes128.c index b2e37ba..a99c8a7 100644 --- a/src/c/aes128.c +++ b/src/c/aes128.c @@ -11,9 +11,9 @@ #include #include -AesNI_Aes_Block __fastcall aesni_aes128_encrypt_block_( - AesNI_Aes_Block plaintext, - const AesNI_Aes128_RoundKeys* encryption_keys) +AesNI_AES_Block __fastcall aesni_AES128_encrypt_block_( + AesNI_AES_Block plaintext, + const AesNI_AES128_RoundKeys* encryption_keys) { plaintext = _mm_xor_si128(plaintext, encryption_keys->keys[0]); plaintext = _mm_aesenc_si128(plaintext, encryption_keys->keys[1]); @@ -28,9 +28,9 @@ AesNI_Aes_Block __fastcall aesni_aes128_encrypt_block_( return _mm_aesenclast_si128(plaintext, encryption_keys->keys[10]); } -AesNI_Aes_Block __fastcall aesni_aes128_decrypt_block_( - AesNI_Aes_Block ciphertext, - const AesNI_Aes128_RoundKeys* decryption_keys) +AesNI_AES_Block __fastcall aesni_AES128_decrypt_block_( + AesNI_AES_Block ciphertext, + const AesNI_AES128_RoundKeys* decryption_keys) { ciphertext = _mm_xor_si128(ciphertext, decryption_keys->keys[0]); ciphertext = _mm_aesdec_si128(ciphertext, decryption_keys->keys[1]); @@ -45,11 +45,11 @@ AesNI_Aes_Block __fastcall aesni_aes128_decrypt_block_( return _mm_aesdeclast_si128(ciphertext, decryption_keys->keys[10]); } -static AesNI_Aes_Block __fastcall aesni_aes128_expand_key_assist( - AesNI_Aes_Block prev, - AesNI_Aes_Block hwgen) +static AesNI_AES_Block __fastcall aesni_aes128_expand_key_assist( + AesNI_AES_Block prev, + AesNI_AES_Block hwgen) { - AesNI_Aes_Block tmp = prev; + AesNI_AES_Block tmp = prev; tmp = _mm_slli_si128(tmp, 4); prev = _mm_xor_si128(prev, tmp); @@ -64,9 +64,9 @@ static AesNI_Aes_Block __fastcall aesni_aes128_expand_key_assist( return prev; } -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) { AesNI_Block128 prev = encryption_keys->keys[0] = key; prev = encryption_keys->keys[1] = aesni_aes128_expand_key_assist(prev, _mm_aeskeygenassist_si128(prev, 0x01)); @@ -81,9 +81,9 @@ void __fastcall aesni_aes128_expand_key_( prev = encryption_keys->keys[10] = aesni_aes128_expand_key_assist(prev, _mm_aeskeygenassist_si128(prev, 0x36)); } -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) { decryption_keys->keys[0] = encryption_keys->keys[10]; decryption_keys->keys[1] = _mm_aesimc_si128(encryption_keys->keys[9]); -- cgit v1.2.3