diff options
author | Egor Tensin <Egor.Tensin@gmail.com> | 2015-07-28 21:34:15 +0300 |
---|---|---|
committer | Egor Tensin <Egor.Tensin@gmail.com> | 2015-07-28 21:34:15 +0300 |
commit | 53dfe511dc29beb8d399e95dfa93b6d3baed6b57 (patch) | |
tree | a0069dba9da96fe6cfc415b4c4fdc2d914cbd593 /src/box_aes.c | |
parent | code style (diff) | |
download | aes-tools-53dfe511dc29beb8d399e95dfa93b6d3baed6b57.tar.gz aes-tools-53dfe511dc29beb8d399e95dfa93b6d3baed6b57.zip |
refactoring
Namely, rename API functions to facilitate metaprogramming using
preprocessor macros.
Diffstat (limited to '')
-rw-r--r-- | src/box_aes.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/box_aes.c b/src/box_aes.c index 4e32aea..8642f31 100644 --- a/src/box_aes.c +++ b/src/box_aes.c @@ -17,10 +17,10 @@ static AesNI_StatusCode aesni_box_derive_params_aes128( AesNI_BoxDecryptionParams* decrypt_params, AesNI_ErrorDetails* err_details) { - aesni_aes128_expand_key_( + aesni_AES128_expand_key_( algorithm_params->aes128_key.key, &encrypt_params->aes128_encryption_keys); - aesni_aes128_derive_decryption_keys_( + aesni_AES128_derive_decryption_keys_( &encrypt_params->aes128_encryption_keys, &decrypt_params->aes128_decryption_keys); return AESNI_SUCCESS; @@ -32,11 +32,11 @@ static AesNI_StatusCode aesni_box_derive_params_aes192( AesNI_BoxDecryptionParams* decrypt_params, AesNI_ErrorDetails* err_details) { - aesni_aes192_expand_key_( + aesni_AES192_expand_key_( algorithm_params->aes192_key.lo, algorithm_params->aes192_key.hi, &encrypt_params->aes192_encryption_keys); - aesni_aes192_derive_decryption_keys_( + aesni_AES192_derive_decryption_keys_( &encrypt_params->aes192_encryption_keys, &decrypt_params->aes192_decryption_keys); return AESNI_SUCCESS; @@ -48,11 +48,11 @@ static AesNI_StatusCode aesni_box_derive_params_aes256( AesNI_BoxDecryptionParams* decrypt_params, AesNI_ErrorDetails* err_details) { - aesni_aes256_expand_key_( + aesni_AES256_expand_key_( algorithm_params->aes256_key.lo, algorithm_params->aes256_key.hi, &encrypt_params->aes256_encryption_keys); - aesni_aes256_derive_decryption_keys_( + aesni_AES256_derive_decryption_keys_( &encrypt_params->aes256_encryption_keys, &decrypt_params->aes256_decryption_keys); return AESNI_SUCCESS; @@ -63,7 +63,7 @@ static AesNI_StatusCode aesni_box_xor_block_aes( const AesNI_BoxBlock* src, AesNI_ErrorDetails* err_details) { - dest->aes_block = aesni_aes_xor_blocks(dest->aes_block, src->aes_block); + dest->aes_block = aesni_AES_xor_blocks(dest->aes_block, src->aes_block); return AESNI_SUCCESS; } @@ -71,7 +71,7 @@ static AesNI_StatusCode aesni_box_inc_block_aes( AesNI_BoxBlock* ctr, AesNI_ErrorDetails* err_details) { - ctr->aes_block = aesni_aes_inc_block(ctr->aes_block); + ctr->aes_block = aesni_AES_inc_block(ctr->aes_block); return AESNI_SUCCESS; } @@ -107,7 +107,7 @@ static AesNI_StatusCode aesni_box_encrypt_block_aes128( AesNI_BoxBlock* output, AesNI_ErrorDetails* err_details) { - output->aes_block = aesni_aes128_encrypt_block_( + output->aes_block = aesni_AES128_encrypt_block_( input->aes_block, ¶ms->aes128_encryption_keys); return AESNI_SUCCESS; @@ -119,7 +119,7 @@ static AesNI_StatusCode aesni_box_decrypt_block_aes128( AesNI_BoxBlock* output, AesNI_ErrorDetails* err_details) { - output->aes_block = aesni_aes128_decrypt_block_( + output->aes_block = aesni_AES128_decrypt_block_( input->aes_block, ¶ms->aes128_decryption_keys); return AESNI_SUCCESS; @@ -131,7 +131,7 @@ static AesNI_StatusCode aesni_box_encrypt_block_aes192( AesNI_BoxBlock* output, AesNI_ErrorDetails* err_details) { - output->aes_block = aesni_aes192_encrypt_block_( + output->aes_block = aesni_AES192_encrypt_block_( input->aes_block, ¶ms->aes192_encryption_keys); return AESNI_SUCCESS; @@ -143,7 +143,7 @@ static AesNI_StatusCode aesni_box_decrypt_block_aes192( AesNI_BoxBlock* output, AesNI_ErrorDetails* err_details) { - output->aes_block = aesni_aes192_decrypt_block_( + output->aes_block = aesni_AES192_decrypt_block_( input->aes_block, ¶ms->aes192_decryption_keys); return AESNI_SUCCESS; @@ -155,7 +155,7 @@ static AesNI_StatusCode aesni_box_encrypt_block_aes256( AesNI_BoxBlock* output, AesNI_ErrorDetails* err_details) { - output->aes_block = aesni_aes256_encrypt_block_( + output->aes_block = aesni_AES256_encrypt_block_( input->aes_block, ¶ms->aes256_encryption_keys); return AESNI_SUCCESS; @@ -167,7 +167,7 @@ static AesNI_StatusCode aesni_box_decrypt_block_aes256( AesNI_BoxBlock* output, AesNI_ErrorDetails* err_details) { - output->aes_block = aesni_aes256_decrypt_block_( + output->aes_block = aesni_AES256_decrypt_block_( input->aes_block, ¶ms->aes256_decryption_keys); return AESNI_SUCCESS; |