refactoring

1 files changed, 0 insertions, 131 deletions

diff --git a/include/aesni/box_aes.h b/include/aesni/box_aes.h
index 98de721..62259a2 100644
--- a/include/aesni/box_aes.h
+++ b/include/aesni/box_aes.h
@@ -8,144 +8,13 @@
 
 #pragma once
 
-#include "aes.h"
-#include "box_aes.h"
 #include "box_data.h"
-#include "data.h"
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-static __inline AesNI_StatusCode aesni_box_derive_params_aes128(
-    const AesNI_BoxAlgorithmParams* algorithm_params,
-    AesNI_BoxEncryptionParams* encrypt_params,
-    AesNI_BoxDecryptionParams* decrypt_params,
-    AesNI_ErrorDetails* err_details)
-{
-    aesni_aes128_expand_key_(
-        algorithm_params->aes128_key.key,
-        &encrypt_params->aes128_encryption_keys);
-    aesni_aes128_derive_decryption_keys_(
-        &encrypt_params->aes128_encryption_keys,
-        &decrypt_params->aes128_decryption_keys);
-    return AESNI_SUCCESS;
-}
-
-static __inline AesNI_StatusCode aesni_box_derive_params_aes192(
-    const AesNI_BoxAlgorithmParams* algorithm_params,
-    AesNI_BoxEncryptionParams* encrypt_params,
-    AesNI_BoxDecryptionParams* decrypt_params,
-    AesNI_ErrorDetails* err_details)
-{
-    aesni_aes192_expand_key_(
-        algorithm_params->aes192_key.lo,
-        algorithm_params->aes192_key.hi,
-        &encrypt_params->aes192_encryption_keys);
-    aesni_aes192_derive_decryption_keys_(
-        &encrypt_params->aes192_encryption_keys,
-        &decrypt_params->aes192_decryption_keys);
-    return AESNI_SUCCESS;
-}
-
-static __inline AesNI_StatusCode aesni_box_derive_params_aes256(
-    const AesNI_BoxAlgorithmParams* algorithm_params,
-    AesNI_BoxEncryptionParams* encrypt_params,
-    AesNI_BoxDecryptionParams* decrypt_params,
-    AesNI_ErrorDetails* err_details)
-{
-    aesni_aes256_expand_key_(
-        algorithm_params->aes256_key.lo,
-        algorithm_params->aes256_key.hi,
-        &encrypt_params->aes256_encryption_keys);
-    aesni_aes256_derive_decryption_keys_(
-        &encrypt_params->aes256_encryption_keys,
-        &decrypt_params->aes256_decryption_keys);
-    return AESNI_SUCCESS;
-}
-
-static __inline AesNI_StatusCode aesni_box_xor_block_aes(
-    AesNI_BoxBlock* dest,
-    const AesNI_BoxBlock* src,
-    AesNI_ErrorDetails* err_details)
-{
-    dest->aes_block = aesni_xor_block128(dest->aes_block, src->aes_block);
-    return AESNI_SUCCESS;
-}
-
-static __inline AesNI_StatusCode aesni_box_encrypt_aes128(
-    const AesNI_BoxBlock* input,
-    const AesNI_BoxEncryptionParams* params,
-    AesNI_BoxBlock* output,
-    AesNI_ErrorDetails* err_details)
-{
-    output->aes_block = aesni_aes128_encrypt_block_(
-        input->aes_block,
-        &params->aes128_encryption_keys);
-    return AESNI_SUCCESS;
-}
-
-static __inline AesNI_StatusCode aesni_box_decrypt_aes128(
-    const AesNI_BoxBlock* input,
-    const AesNI_BoxDecryptionParams* params,
-    AesNI_BoxBlock* output,
-    AesNI_ErrorDetails* err_details)
-{
-    output->aes_block = aesni_aes128_decrypt_block_(
-        input->aes_block,
-        &params->aes128_decryption_keys);
-    return AESNI_SUCCESS;
-}
-
-static __inline AesNI_StatusCode aesni_box_encrypt_aes192(
-    const AesNI_BoxBlock* input,
-    const AesNI_BoxEncryptionParams* params,
-    AesNI_BoxBlock* output,
-    AesNI_ErrorDetails* err_details)
-{
-    output->aes_block = aesni_aes192_encrypt_block_(
-        input->aes_block,
-        &params->aes192_encryption_keys);
-    return AESNI_SUCCESS;
-}
-
-static __inline AesNI_StatusCode aesni_box_decrypt_aes192(
-    const AesNI_BoxBlock* input,
-    const AesNI_BoxDecryptionParams* params,
-    AesNI_BoxBlock* output,
-    AesNI_ErrorDetails* err_details)
-{
-    output->aes_block = aesni_aes192_decrypt_block_(
-        input->aes_block,
-        &params->aes192_decryption_keys);
-    return AESNI_SUCCESS;
-}
-
-static __inline AesNI_StatusCode aesni_box_encrypt_aes256(
-    const AesNI_BoxBlock* input,
-    const AesNI_BoxEncryptionParams* params,
-    AesNI_BoxBlock* output,
-    AesNI_ErrorDetails* err_details)
-{
-    output->aes_block = aesni_aes256_encrypt_block_(
-        input->aes_block,
-        &params->aes256_encryption_keys);
-    return AESNI_SUCCESS;
-}
-
-static __inline AesNI_StatusCode aesni_box_decrypt_aes256(
-    const AesNI_BoxBlock* input,
-    const AesNI_BoxDecryptionParams* params,
-    AesNI_BoxBlock* output,
-    AesNI_ErrorDetails* err_details)
-{
-    output->aes_block = aesni_aes256_decrypt_block_(
-        input->aes_block,
-        &params->aes256_decryption_keys);
-    return AESNI_SUCCESS;
-}
-
 extern AesNI_BoxAlgorithmInterface aesni_box_aes128_iface;
 extern AesNI_BoxAlgorithmInterface aesni_box_aes192_iface;
 extern AesNI_BoxAlgorithmInterface aesni_box_aes256_iface;