diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2015-09-01 02:53:39 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2015-09-01 02:53:39 +0300 |
| commit | 32f8a474fdfe5ed1a5a9dfc34fa2dd41e1a6d9c1 (patch) | |
| tree | 4d7eec934fd76754dfa0e28868f3f67601ba9d05 /include | |
| parent | cxx: Boost.Config for compiler workarounds (diff) | |
| download | aes-tools-32f8a474fdfe5ed1a5a9dfc34fa2dd41e1a6d9c1.tar.gz aes-tools-32f8a474fdfe5ed1a5a9dfc34fa2dd41e1a6d9c1.zip | |
refactoring
Diffstat (limited to 'include')
| -rw-r--r-- | include/aesni/box.h | 2 | ||||
| -rw-r--r-- | include/aesni/box_data.h | 31 |
2 files changed, 20 insertions, 13 deletions
diff --git a/include/aesni/box.h b/include/aesni/box.h index 1ff7941..04c2b6c 100644 --- a/include/aesni/box.h +++ b/include/aesni/box.h @@ -22,7 +22,7 @@ extern "C" AesNI_StatusCode aesni_box_init( AesNI_Box* box, AesNI_Algorithm algorithm, - const AesNI_BoxAlgorithmParams* algorithm_params, + const AesNI_BoxKey* box_key, AesNI_Mode mode, const AesNI_BoxBlock* iv, AesNI_ErrorDetails* err_details); diff --git a/include/aesni/box_data.h b/include/aesni/box_data.h index 5d27641..d184c30 100644 --- a/include/aesni/box_data.h +++ b/include/aesni/box_data.h @@ -25,7 +25,7 @@ typedef union AesNI_AES192_Key aes192_key; AesNI_AES256_Key aes256_key; } -AesNI_BoxAlgorithmParams; +AesNI_BoxKey; typedef union { @@ -33,7 +33,7 @@ typedef union AesNI_AES192_RoundKeys aes192_encryption_keys; AesNI_AES256_RoundKeys aes256_encryption_keys; } -AesNI_BoxEncryptionParams; +AesNI_BoxEncryptionRoundKeys; typedef union { @@ -41,7 +41,7 @@ typedef union AesNI_AES192_RoundKeys aes192_decryption_keys; AesNI_AES256_RoundKeys aes256_decryption_keys; } -AesNI_BoxDecryptionParams; +AesNI_BoxDecryptionRoundKeys; typedef union { @@ -49,21 +49,26 @@ typedef union } AesNI_BoxBlock; -typedef AesNI_StatusCode (*AesNI_BoxDeriveParams)( - const AesNI_BoxAlgorithmParams* params, - AesNI_BoxEncryptionParams*, - AesNI_BoxDecryptionParams*, +typedef AesNI_StatusCode (*AesNI_BoxCalculateRoundKeys)( + const AesNI_BoxKey* params, + AesNI_BoxEncryptionRoundKeys*, + AesNI_BoxDecryptionRoundKeys*, AesNI_ErrorDetails* err_details); +/* typedef AesNI_StatusCode (*AesNI_BoxParseBlock)( + AesNI_BoxBlock* dest, + const char* src, + AesNI_ErrorDetails* err_details); */ + typedef AesNI_StatusCode (*AesNI_BoxEncryptBlock)( const AesNI_BoxBlock* plaintext, - const AesNI_BoxEncryptionParams* params, + const AesNI_BoxEncryptionRoundKeys* params, AesNI_BoxBlock* ciphertext, AesNI_ErrorDetails* err_details); typedef AesNI_StatusCode (*AesNI_BoxDecryptBlock)( const AesNI_BoxBlock* ciphertext, - const AesNI_BoxDecryptionParams* params, + const AesNI_BoxDecryptionRoundKeys* params, AesNI_BoxBlock* plaintext, AesNI_ErrorDetails* err_details); @@ -92,7 +97,9 @@ typedef AesNI_StatusCode (*AesNI_BoxLoadBlock)( typedef struct { - AesNI_BoxDeriveParams derive_params; + AesNI_BoxCalculateRoundKeys calc_round_keys; + //AesNI_BoxParseBlock parse_block; + //AesNI_BoxParseKey parse_key; AesNI_BoxEncryptBlock encrypt_block; AesNI_BoxDecryptBlock decrypt_block; AesNI_BoxXorBlock xor_block; @@ -106,8 +113,8 @@ AesNI_BoxAlgorithmInterface; typedef struct { const AesNI_BoxAlgorithmInterface* algorithm; - AesNI_BoxEncryptionParams encrypt_params; - AesNI_BoxDecryptionParams decrypt_params; + AesNI_BoxEncryptionRoundKeys encryption_keys; + AesNI_BoxDecryptionRoundKeys decryption_keys; AesNI_Mode mode; AesNI_BoxBlock iv; } |