blocks are the same for every variant

2 files changed, 13 insertions, 47 deletions

diff --git a/aes/include/aes/box.h b/aes/include/aes/box.h
index 0a43943..37292dd 100644
--- a/aes/include/aes/box.h
+++ b/aes/include/aes/box.h
@@ -20,7 +20,7 @@ AES_StatusCode aes_box_init(
     AES_Algorithm algorithm,
     const AES_BoxKey* box_key,
     AES_Mode mode,
-    const AES_BoxBlock* iv,
+    const AES_Block* iv,
     AES_ErrorDetails* err_details
 );
 
@@ -32,7 +32,7 @@ AES_StatusCode aes_box_parse_key(
 );
 
 AES_StatusCode aes_box_parse_block(
-    AES_BoxBlock* dest,
+    AES_Block* dest,
     AES_Algorithm algorithm,
     const char* src,
     AES_ErrorDetails* err_details
@@ -46,23 +46,23 @@ AES_StatusCode aes_box_format_key(
 );
 
 AES_StatusCode aes_box_format_block(
-    AES_BoxBlockString* dest,
+    AES_BlockString* dest,
     AES_Algorithm algorithm,
-    const AES_BoxBlock* src,
+    const AES_Block* src,
     AES_ErrorDetails* err_details
 );
 
 AES_StatusCode aes_box_encrypt_block(
     AES_Box* box,
-    const AES_BoxBlock* plaintext,
-    AES_BoxBlock* ciphertext,
+    const AES_Block* plaintext,
+    AES_Block* ciphertext,
     AES_ErrorDetails* err_details
 );
 
 AES_StatusCode aes_box_decrypt_block(
     AES_Box* box,
-    const AES_BoxBlock* ciphertext,
-    AES_BoxBlock* plaintext,
+    const AES_Block* ciphertext,
+    AES_Block* plaintext,
     AES_ErrorDetails* err_details
 );
 
diff --git a/aes/include/aes/box_data.h b/aes/include/aes/box_data.h
index e3137f3..0777d2e 100644
--- a/aes/include/aes/box_data.h
+++ b/aes/include/aes/box_data.h
@@ -39,14 +39,6 @@ typedef union {
     AES256_KeyString aes256;
 } AES_BoxKeyString;
 
-typedef union {
-    AES_Block aes_block;
-} AES_BoxBlock;
-
-typedef union {
-    AES_BlockString aes;
-} AES_BoxBlockString;
-
 typedef AES_StatusCode (*AES_BoxCalculateRoundKeys)(
     const AES_BoxKey* params,
     AES_BoxEncryptionRoundKeys*,
@@ -54,24 +46,12 @@ typedef AES_StatusCode (*AES_BoxCalculateRoundKeys)(
     AES_ErrorDetails* err_details
 );
 
-typedef AES_StatusCode (*AES_BoxParseBlock)(
-    AES_BoxBlock* dest,
-    const char* src,
-    AES_ErrorDetails* err_details
-);
-
 typedef AES_StatusCode (*AES_BoxParseKey)(
     AES_BoxKey* dest,
     const char* src,
     AES_ErrorDetails* err_details
 );
 
-typedef AES_StatusCode (*AES_BoxFormatBlock)(
-    AES_BoxBlockString* dest,
-    const AES_BoxBlock* src,
-    AES_ErrorDetails* err_details
-);
-
 typedef AES_StatusCode (*AES_BoxFormatKey)(
     AES_BoxKeyString* dest,
     const AES_BoxKey* src,
@@ -79,42 +59,28 @@ typedef AES_StatusCode (*AES_BoxFormatKey)(
 );
 
 typedef AES_StatusCode (*AES_BoxEncryptBlock)(
-    const AES_BoxBlock* plaintext,
+    const AES_Block* plaintext,
     const AES_BoxEncryptionRoundKeys* params,
-    AES_BoxBlock* ciphertext,
+    AES_Block* ciphertext,
     AES_ErrorDetails* err_details
 );
 
 typedef AES_StatusCode (*AES_BoxDecryptBlock)(
-    const AES_BoxBlock* ciphertext,
+    const AES_Block* ciphertext,
     const AES_BoxDecryptionRoundKeys* params,
-    AES_BoxBlock* plaintext,
+    AES_Block* plaintext,
     AES_ErrorDetails* err_details
 );
 
-typedef AES_StatusCode (*AES_BoxXorBlock)(AES_BoxBlock*, const AES_BoxBlock*, AES_ErrorDetails*);
-
-typedef AES_StatusCode (*AES_BoxIncBlock)(AES_BoxBlock*, AES_ErrorDetails*);
-
 typedef AES_StatusCode (*AES_BoxGetBlockSize)(size_t*, AES_ErrorDetails*);
 
-typedef AES_StatusCode (*AES_BoxStoreBlock)(void*, const AES_BoxBlock*, AES_ErrorDetails*);
-
-typedef AES_StatusCode (*AES_BoxLoadBlock)(AES_BoxBlock*, const void*, AES_ErrorDetails*);
-
 typedef struct {
     AES_BoxCalculateRoundKeys calc_round_keys;
-    AES_BoxParseBlock parse_block;
     AES_BoxParseKey parse_key;
-    AES_BoxFormatBlock format_block;
     AES_BoxFormatKey format_key;
     AES_BoxEncryptBlock encrypt_block;
     AES_BoxDecryptBlock decrypt_block;
-    AES_BoxXorBlock xor_block;
-    AES_BoxIncBlock inc_block;
     AES_BoxGetBlockSize get_block_size;
-    AES_BoxStoreBlock store_block;
-    AES_BoxLoadBlock load_block;
 } AES_BoxInterface;
 
 typedef struct {
@@ -122,7 +88,7 @@ typedef struct {
     AES_BoxEncryptionRoundKeys encryption_keys;
     AES_BoxDecryptionRoundKeys decryption_keys;
     AES_Mode mode;
-    AES_BoxBlock iv;
+    AES_Block iv;
 } AES_Box;
 
 #ifdef __cplusplus