From f2c9b2934b9be0f93105c411f5dbea564800fc3f Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Mon, 20 Jul 2026 21:32:29 +0200 Subject: remove a few levels of stupid indirection --- aes/src/c/aes128.c | 29 +++++++++++++---------------- aes/src/c/aes192.c | 34 +++++++++++++++++----------------- aes/src/c/aes256.c | 40 ++++++++++++++++++++-------------------- 3 files changed, 50 insertions(+), 53 deletions(-) (limited to 'aes/src/c') diff --git a/aes/src/c/aes128.c b/aes/src/c/aes128.c index d7b7243..cf78722 100644 --- a/aes/src/c/aes128.c +++ b/aes/src/c/aes128.c @@ -10,9 +10,9 @@ #include #include -AES_AES_Block __fastcall aes_AES128_encrypt_block_( - AES_AES_Block plaintext, - const AES_AES128_RoundKeys* encryption_keys +AES_Block __fastcall aes128_encrypt_block_( + AES_Block plaintext, + const AES128_RoundKeys* encryption_keys ) { plaintext = _mm_xor_si128(plaintext, encryption_keys->keys[0]); plaintext = _mm_aesenc_si128(plaintext, encryption_keys->keys[1]); @@ -27,9 +27,9 @@ AES_AES_Block __fastcall aes_AES128_encrypt_block_( return _mm_aesenclast_si128(plaintext, encryption_keys->keys[10]); } -AES_AES_Block __fastcall aes_AES128_decrypt_block_( - AES_AES_Block ciphertext, - const AES_AES128_RoundKeys* decryption_keys +AES_Block __fastcall aes128_decrypt_block_( + AES_Block ciphertext, + const AES128_RoundKeys* decryption_keys ) { ciphertext = _mm_xor_si128(ciphertext, decryption_keys->keys[0]); ciphertext = _mm_aesdec_si128(ciphertext, decryption_keys->keys[1]); @@ -44,11 +44,8 @@ AES_AES_Block __fastcall aes_AES128_decrypt_block_( return _mm_aesdeclast_si128(ciphertext, decryption_keys->keys[10]); } -static AES_AES_Block __fastcall aes_aes128_expand_key_assist( - AES_AES_Block prev, - AES_AES_Block hwgen -) { - AES_AES_Block tmp = prev; +static AES_Block __fastcall aes_aes128_expand_key_assist(AES_Block prev, AES_Block hwgen) { + AES_Block tmp = prev; tmp = _mm_slli_si128(tmp, 4); prev = _mm_xor_si128(prev, tmp); @@ -63,8 +60,8 @@ static AES_AES_Block __fastcall aes_aes128_expand_key_assist( return prev; } -void __fastcall aes_AES128_expand_key_(AES_AES_Block key, AES_AES128_RoundKeys* encryption_keys) { - AES_Block128 prev = encryption_keys->keys[0] = key; +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)); prev = encryption_keys->keys[2] = @@ -87,9 +84,9 @@ void __fastcall aes_AES128_expand_key_(AES_AES_Block key, AES_AES128_RoundKeys* aes_aes128_expand_key_assist(prev, _mm_aeskeygenassist_si128(prev, 0x36)); } -void __fastcall aes_AES128_derive_decryption_keys_( - const AES_AES128_RoundKeys* encryption_keys, - AES_AES128_RoundKeys* decryption_keys +void __fastcall aes128_derive_decryption_keys_( + const AES128_RoundKeys* encryption_keys, + AES128_RoundKeys* decryption_keys ) { decryption_keys->keys[0] = encryption_keys->keys[10]; decryption_keys->keys[1] = _mm_aesimc_si128(encryption_keys->keys[9]); diff --git a/aes/src/c/aes192.c b/aes/src/c/aes192.c index 901b548..d257df7 100644 --- a/aes/src/c/aes192.c +++ b/aes/src/c/aes192.c @@ -10,9 +10,9 @@ #include #include -AES_AES_Block __fastcall aes_AES192_encrypt_block_( - AES_AES_Block plaintext, - const AES_AES192_RoundKeys* encryption_keys +AES_Block __fastcall aes192_encrypt_block_( + AES_Block plaintext, + const AES192_RoundKeys* encryption_keys ) { plaintext = _mm_xor_si128(plaintext, encryption_keys->keys[0]); plaintext = _mm_aesenc_si128(plaintext, encryption_keys->keys[1]); @@ -29,9 +29,9 @@ AES_AES_Block __fastcall aes_AES192_encrypt_block_( return _mm_aesenclast_si128(plaintext, encryption_keys->keys[12]); } -AES_AES_Block __fastcall aes_AES192_decrypt_block_( - AES_AES_Block ciphertext, - const AES_AES192_RoundKeys* decryption_keys +AES_Block __fastcall aes192_decrypt_block_( + AES_Block ciphertext, + const AES192_RoundKeys* decryption_keys ) { ciphertext = _mm_xor_si128(ciphertext, decryption_keys->keys[0]); ciphertext = _mm_aesdec_si128(ciphertext, decryption_keys->keys[1]); @@ -49,11 +49,11 @@ AES_AES_Block __fastcall aes_AES192_decrypt_block_( } static void __fastcall aes_aes192_expand_key_assist( - AES_AES_Block* prev_lo, - AES_AES_Block* prev_hi, - AES_AES_Block hwgen + AES_Block* prev_lo, + AES_Block* prev_hi, + AES_Block hwgen ) { - AES_AES_Block tmp = *prev_lo; + AES_Block tmp = *prev_lo; tmp = _mm_slli_si128(tmp, 4); *prev_lo = _mm_xor_si128(*prev_lo, tmp); @@ -73,10 +73,10 @@ static void __fastcall aes_aes192_expand_key_assist( *prev_hi = _mm_xor_si128(*prev_hi, tmp); } -void __fastcall aes_AES192_expand_key_( - AES_AES_Block key_lo, - AES_AES_Block key_hi, - AES_AES192_RoundKeys* encryption_keys +void __fastcall aes192_expand_key_( + AES_Block key_lo, + AES_Block key_hi, + AES192_RoundKeys* encryption_keys ) { encryption_keys->keys[0] = key_lo; encryption_keys->keys[1] = key_hi; @@ -125,9 +125,9 @@ void __fastcall aes_AES192_expand_key_( encryption_keys->keys[12] = key_lo; } -void __fastcall aes_AES192_derive_decryption_keys_( - const AES_AES192_RoundKeys* encryption_keys, - AES_AES192_RoundKeys* decryption_keys +void __fastcall aes192_derive_decryption_keys_( + const AES192_RoundKeys* encryption_keys, + AES192_RoundKeys* decryption_keys ) { decryption_keys->keys[0] = encryption_keys->keys[12]; decryption_keys->keys[1] = _mm_aesimc_si128(encryption_keys->keys[11]); diff --git a/aes/src/c/aes256.c b/aes/src/c/aes256.c index 5bce5b5..f1b5aef 100644 --- a/aes/src/c/aes256.c +++ b/aes/src/c/aes256.c @@ -10,9 +10,9 @@ #include #include -AES_AES_Block __fastcall aes_AES256_encrypt_block_( - AES_AES_Block plaintext, - const AES_AES256_RoundKeys* encryption_keys +AES_Block __fastcall aes256_encrypt_block_( + AES_Block plaintext, + const AES256_RoundKeys* encryption_keys ) { plaintext = _mm_xor_si128(plaintext, encryption_keys->keys[0]); plaintext = _mm_aesenc_si128(plaintext, encryption_keys->keys[1]); @@ -31,9 +31,9 @@ AES_AES_Block __fastcall aes_AES256_encrypt_block_( return _mm_aesenclast_si128(plaintext, encryption_keys->keys[14]); } -AES_AES_Block __fastcall aes_AES256_decrypt_block_( - AES_AES_Block ciphertext, - const AES_AES256_RoundKeys* decryption_keys +AES_Block __fastcall aes256_decrypt_block_( + AES_Block ciphertext, + const AES256_RoundKeys* decryption_keys ) { ciphertext = _mm_xor_si128(ciphertext, decryption_keys->keys[0]); ciphertext = _mm_aesdec_si128(ciphertext, decryption_keys->keys[1]); @@ -52,12 +52,12 @@ AES_AES_Block __fastcall aes_AES256_decrypt_block_( return _mm_aesdeclast_si128(ciphertext, decryption_keys->keys[14]); } -static AES_AES_Block __fastcall aes_aes256_expand_key_assist( - AES_AES_Block* prev_lo, - AES_AES_Block* prev_hi, - AES_AES_Block hwgen +static AES_Block __fastcall aes_aes256_expand_key_assist( + AES_Block* prev_lo, + AES_Block* prev_hi, + AES_Block hwgen ) { - AES_AES_Block tmp = *prev_lo; + AES_Block tmp = *prev_lo; tmp = _mm_slli_si128(tmp, 4); *prev_lo = _mm_xor_si128(*prev_lo, tmp); @@ -75,13 +75,13 @@ static AES_AES_Block __fastcall aes_aes256_expand_key_assist( return *prev_hi; } -void __fastcall aes_AES256_expand_key_( - AES_AES_Block key_lo, - AES_AES_Block key_hi, - AES_AES256_RoundKeys* encryption_keys +void __fastcall aes256_expand_key_( + AES_Block key_lo, + AES_Block key_hi, + AES256_RoundKeys* encryption_keys ) { - AES_AES_Block prev_lo, prev_hi; - AES_AES_Block hwgen; + AES_Block prev_lo, prev_hi; + AES_Block hwgen; prev_lo = encryption_keys->keys[0] = key_lo; prev_hi = encryption_keys->keys[1] = key_hi; @@ -139,9 +139,9 @@ void __fastcall aes_AES256_expand_key_( encryption_keys->keys[14] = aes_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen); } -void __fastcall aes_AES256_derive_decryption_keys_( - const AES_AES256_RoundKeys* encryption_keys, - AES_AES256_RoundKeys* decryption_keys +void __fastcall aes256_derive_decryption_keys_( + const AES256_RoundKeys* encryption_keys, + AES256_RoundKeys* decryption_keys ) { decryption_keys->keys[0] = encryption_keys->keys[14]; decryption_keys->keys[1] = _mm_aesimc_si128(encryption_keys->keys[13]); -- cgit v1.3