From 8430473494fcdbf39e02fcff80d51124df728e97 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Wed, 17 Jun 2015 21:09:42 +0300 Subject: refactoring --- src/c/aes256.c | 134 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 67 insertions(+), 67 deletions(-) (limited to 'src/c/aes256.c') diff --git a/src/c/aes256.c b/src/c/aes256.c index 05e643e..820010d 100644 --- a/src/c/aes256.c +++ b/src/c/aes256.c @@ -12,45 +12,45 @@ #include AesNI_Block128 __fastcall aesni_aes256_encrypt_block_( - AesNI_Block128 plain, - const AesNI_Aes256_RoundKeys* key_schedule) + AesNI_Block128 plaintext, + const AesNI_Aes256_RoundKeys* encryption_keys) { - plain = _mm_xor_si128(plain, key_schedule->keys[0]); - plain = _mm_aesenc_si128(plain, key_schedule->keys[1]); - plain = _mm_aesenc_si128(plain, key_schedule->keys[2]); - plain = _mm_aesenc_si128(plain, key_schedule->keys[3]); - plain = _mm_aesenc_si128(plain, key_schedule->keys[4]); - plain = _mm_aesenc_si128(plain, key_schedule->keys[5]); - plain = _mm_aesenc_si128(plain, key_schedule->keys[6]); - plain = _mm_aesenc_si128(plain, key_schedule->keys[7]); - plain = _mm_aesenc_si128(plain, key_schedule->keys[8]); - plain = _mm_aesenc_si128(plain, key_schedule->keys[9]); - plain = _mm_aesenc_si128(plain, key_schedule->keys[10]); - plain = _mm_aesenc_si128(plain, key_schedule->keys[11]); - plain = _mm_aesenc_si128(plain, key_schedule->keys[12]); - plain = _mm_aesenc_si128(plain, key_schedule->keys[13]); - return _mm_aesenclast_si128(plain, key_schedule->keys[14]); + plaintext = _mm_xor_si128(plaintext, encryption_keys->keys[0]); + plaintext = _mm_aesenc_si128(plaintext, encryption_keys->keys[1]); + plaintext = _mm_aesenc_si128(plaintext, encryption_keys->keys[2]); + plaintext = _mm_aesenc_si128(plaintext, encryption_keys->keys[3]); + plaintext = _mm_aesenc_si128(plaintext, encryption_keys->keys[4]); + plaintext = _mm_aesenc_si128(plaintext, encryption_keys->keys[5]); + plaintext = _mm_aesenc_si128(plaintext, encryption_keys->keys[6]); + plaintext = _mm_aesenc_si128(plaintext, encryption_keys->keys[7]); + plaintext = _mm_aesenc_si128(plaintext, encryption_keys->keys[8]); + plaintext = _mm_aesenc_si128(plaintext, encryption_keys->keys[9]); + plaintext = _mm_aesenc_si128(plaintext, encryption_keys->keys[10]); + plaintext = _mm_aesenc_si128(plaintext, encryption_keys->keys[11]); + plaintext = _mm_aesenc_si128(plaintext, encryption_keys->keys[12]); + plaintext = _mm_aesenc_si128(plaintext, encryption_keys->keys[13]); + return _mm_aesenclast_si128(plaintext, encryption_keys->keys[14]); } AesNI_Block128 __fastcall aesni_aes256_decrypt_block_( - AesNI_Block128 cipher, - const AesNI_Aes256_RoundKeys* inverted_schedule) + AesNI_Block128 ciphertext, + const AesNI_Aes256_RoundKeys* decryption_keys) { - cipher = _mm_xor_si128(cipher, inverted_schedule->keys[0]); - cipher = _mm_aesdec_si128(cipher, inverted_schedule->keys[1]); - cipher = _mm_aesdec_si128(cipher, inverted_schedule->keys[2]); - cipher = _mm_aesdec_si128(cipher, inverted_schedule->keys[3]); - cipher = _mm_aesdec_si128(cipher, inverted_schedule->keys[4]); - cipher = _mm_aesdec_si128(cipher, inverted_schedule->keys[5]); - cipher = _mm_aesdec_si128(cipher, inverted_schedule->keys[6]); - cipher = _mm_aesdec_si128(cipher, inverted_schedule->keys[7]); - cipher = _mm_aesdec_si128(cipher, inverted_schedule->keys[8]); - cipher = _mm_aesdec_si128(cipher, inverted_schedule->keys[9]); - cipher = _mm_aesdec_si128(cipher, inverted_schedule->keys[10]); - cipher = _mm_aesdec_si128(cipher, inverted_schedule->keys[11]); - cipher = _mm_aesdec_si128(cipher, inverted_schedule->keys[12]); - cipher = _mm_aesdec_si128(cipher, inverted_schedule->keys[13]); - return _mm_aesdeclast_si128(cipher, inverted_schedule->keys[14]); + ciphertext = _mm_xor_si128(ciphertext, decryption_keys->keys[0]); + ciphertext = _mm_aesdec_si128(ciphertext, decryption_keys->keys[1]); + ciphertext = _mm_aesdec_si128(ciphertext, decryption_keys->keys[2]); + ciphertext = _mm_aesdec_si128(ciphertext, decryption_keys->keys[3]); + ciphertext = _mm_aesdec_si128(ciphertext, decryption_keys->keys[4]); + ciphertext = _mm_aesdec_si128(ciphertext, decryption_keys->keys[5]); + ciphertext = _mm_aesdec_si128(ciphertext, decryption_keys->keys[6]); + ciphertext = _mm_aesdec_si128(ciphertext, decryption_keys->keys[7]); + ciphertext = _mm_aesdec_si128(ciphertext, decryption_keys->keys[8]); + ciphertext = _mm_aesdec_si128(ciphertext, decryption_keys->keys[9]); + ciphertext = _mm_aesdec_si128(ciphertext, decryption_keys->keys[10]); + ciphertext = _mm_aesdec_si128(ciphertext, decryption_keys->keys[11]); + ciphertext = _mm_aesdec_si128(ciphertext, decryption_keys->keys[12]); + ciphertext = _mm_aesdec_si128(ciphertext, decryption_keys->keys[13]); + return _mm_aesdeclast_si128(ciphertext, decryption_keys->keys[14]); } static AesNI_Block128 __fastcall aesni_aes256_expand_key_assist( @@ -79,84 +79,84 @@ static AesNI_Block128 __fastcall aesni_aes256_expand_key_assist( void __fastcall aesni_aes256_expand_key_( AesNI_Block128 key_lo, AesNI_Block128 key_hi, - AesNI_Aes256_RoundKeys* key_schedule) + AesNI_Aes256_RoundKeys* encryption_keys) { 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; + prev_lo = encryption_keys->keys[0] = key_lo; + prev_hi = encryption_keys->keys[1] = key_hi; hwgen = _mm_aeskeygenassist_si128(prev_hi, 0x01); hwgen = _mm_shuffle_epi32(hwgen, 0xff); - key_schedule->keys[2] = aesni_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen); + encryption_keys->keys[2] = aesni_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen); hwgen = _mm_aeskeygenassist_si128(prev_hi, 0); hwgen = _mm_shuffle_epi32(hwgen, 0xaa); - key_schedule->keys[3] = aesni_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen); + encryption_keys->keys[3] = aesni_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen); hwgen = _mm_aeskeygenassist_si128(prev_hi, 0x02); hwgen = _mm_shuffle_epi32(hwgen, 0xff); - key_schedule->keys[4] = aesni_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen); + encryption_keys->keys[4] = aesni_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen); hwgen = _mm_aeskeygenassist_si128(prev_hi, 0); hwgen = _mm_shuffle_epi32(hwgen, 0xaa); - key_schedule->keys[5] = aesni_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen); + encryption_keys->keys[5] = aesni_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen); hwgen = _mm_aeskeygenassist_si128(prev_hi, 0x04); hwgen = _mm_shuffle_epi32(hwgen, 0xff); - key_schedule->keys[6] = aesni_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen); + encryption_keys->keys[6] = aesni_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen); hwgen = _mm_aeskeygenassist_si128(prev_hi, 0); hwgen = _mm_shuffle_epi32(hwgen, 0xaa); - key_schedule->keys[7] = aesni_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen); + encryption_keys->keys[7] = aesni_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen); hwgen = _mm_aeskeygenassist_si128(prev_hi, 0x08); hwgen = _mm_shuffle_epi32(hwgen, 0xff); - key_schedule->keys[8] = aesni_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen); + encryption_keys->keys[8] = aesni_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen); hwgen = _mm_aeskeygenassist_si128(prev_hi, 0); hwgen = _mm_shuffle_epi32(hwgen, 0xaa); - key_schedule->keys[9] = aesni_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen); + encryption_keys->keys[9] = aesni_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen); hwgen = _mm_aeskeygenassist_si128(prev_hi, 0x10); hwgen = _mm_shuffle_epi32(hwgen, 0xff); - key_schedule->keys[10] = aesni_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen); + encryption_keys->keys[10] = aesni_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen); hwgen = _mm_aeskeygenassist_si128(prev_hi, 0); hwgen = _mm_shuffle_epi32(hwgen, 0xaa); - key_schedule->keys[11] = aesni_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen); + encryption_keys->keys[11] = aesni_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen); hwgen = _mm_aeskeygenassist_si128(prev_hi, 0x20); hwgen = _mm_shuffle_epi32(hwgen, 0xff); - key_schedule->keys[12] = aesni_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen); + encryption_keys->keys[12] = aesni_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen); hwgen = _mm_aeskeygenassist_si128(prev_hi, 0); hwgen = _mm_shuffle_epi32(hwgen, 0xaa); - key_schedule->keys[13] = aesni_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen); + encryption_keys->keys[13] = aesni_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen); hwgen = _mm_aeskeygenassist_si128(prev_hi, 0x40); hwgen = _mm_shuffle_epi32(hwgen, 0xff); - key_schedule->keys[14] = aesni_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen); + encryption_keys->keys[14] = aesni_aes256_expand_key_assist(&prev_lo, &prev_hi, hwgen); } void __fastcall aesni_aes256_derive_decryption_keys_( - const AesNI_Aes256_RoundKeys* key_schedule, - AesNI_Aes256_RoundKeys* inverted_schedule) + const AesNI_Aes256_RoundKeys* encryption_keys, + AesNI_Aes256_RoundKeys* decryption_keys) { - inverted_schedule->keys[0] = key_schedule->keys[14]; - inverted_schedule->keys[1] = _mm_aesimc_si128(key_schedule->keys[13]); - inverted_schedule->keys[2] = _mm_aesimc_si128(key_schedule->keys[12]); - inverted_schedule->keys[3] = _mm_aesimc_si128(key_schedule->keys[11]); - inverted_schedule->keys[4] = _mm_aesimc_si128(key_schedule->keys[10]); - inverted_schedule->keys[5] = _mm_aesimc_si128(key_schedule->keys[9]); - inverted_schedule->keys[6] = _mm_aesimc_si128(key_schedule->keys[8]); - inverted_schedule->keys[7] = _mm_aesimc_si128(key_schedule->keys[7]); - inverted_schedule->keys[8] = _mm_aesimc_si128(key_schedule->keys[6]); - inverted_schedule->keys[9] = _mm_aesimc_si128(key_schedule->keys[5]); - inverted_schedule->keys[10] = _mm_aesimc_si128(key_schedule->keys[4]); - inverted_schedule->keys[11] = _mm_aesimc_si128(key_schedule->keys[3]); - inverted_schedule->keys[12] = _mm_aesimc_si128(key_schedule->keys[2]); - inverted_schedule->keys[13] = _mm_aesimc_si128(key_schedule->keys[1]); - inverted_schedule->keys[14] = key_schedule->keys[0]; + decryption_keys->keys[0] = encryption_keys->keys[14]; + decryption_keys->keys[1] = _mm_aesimc_si128(encryption_keys->keys[13]); + decryption_keys->keys[2] = _mm_aesimc_si128(encryption_keys->keys[12]); + decryption_keys->keys[3] = _mm_aesimc_si128(encryption_keys->keys[11]); + decryption_keys->keys[4] = _mm_aesimc_si128(encryption_keys->keys[10]); + decryption_keys->keys[5] = _mm_aesimc_si128(encryption_keys->keys[9]); + decryption_keys->keys[6] = _mm_aesimc_si128(encryption_keys->keys[8]); + decryption_keys->keys[7] = _mm_aesimc_si128(encryption_keys->keys[7]); + decryption_keys->keys[8] = _mm_aesimc_si128(encryption_keys->keys[6]); + decryption_keys->keys[9] = _mm_aesimc_si128(encryption_keys->keys[5]); + decryption_keys->keys[10] = _mm_aesimc_si128(encryption_keys->keys[4]); + decryption_keys->keys[11] = _mm_aesimc_si128(encryption_keys->keys[3]); + decryption_keys->keys[12] = _mm_aesimc_si128(encryption_keys->keys[2]); + decryption_keys->keys[13] = _mm_aesimc_si128(encryption_keys->keys[1]); + decryption_keys->keys[14] = encryption_keys->keys[0]; } -- cgit v1.2.3