From 3a1cc6ad7e6b4d924973c8ee2689746d5ca98818 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Tue, 21 Jul 2026 15:14:59 +0200 Subject: remove more stupid crap --- aes/include/aes/aes.h | 124 ++------------------------------------------ aes/src/aes.c | 25 ++++----- aesxx/include/aesxx/aes.hpp | 18 +++---- aesxx/include/aesxx/box.hpp | 4 +- 4 files changed, 25 insertions(+), 146 deletions(-) diff --git a/aes/include/aes/aes.h b/aes/include/aes/aes.h index 99e5f4b..73d6618 100644 --- a/aes/include/aes/aes.h +++ b/aes/include/aes/aes.h @@ -74,133 +74,19 @@ typedef AES_BlockMatrixString AES128_BlockMatrixString; typedef AES_BlockMatrixString AES192_BlockMatrixString; typedef AES_BlockMatrixString AES256_BlockMatrixString; -AES_StatusCode aes_AES_format_block(AES_BlockString*, const AES_Block*, AES_ErrorDetails*); +AES_StatusCode aes_format_block(AES_BlockString*, const AES_Block*, AES_ErrorDetails*); -static inline AES_StatusCode aes128_format_block( - AES128_BlockString* dest, - const AES_Block* src, - AES_ErrorDetails* err_details -) { - return aes_AES_format_block(dest, src, err_details); -} - -static inline AES_StatusCode aes192_format_block( - AES192_BlockString* dest, - const AES_Block* src, - AES_ErrorDetails* err_details -) { - return aes_AES_format_block(dest, src, err_details); -} - -static inline AES_StatusCode aes256_format_block( - AES256_BlockString* dest, - const AES_Block* src, - AES_ErrorDetails* err_details -) { - return aes_AES_format_block(dest, src, err_details); -} - -AES_StatusCode aes_AES_format_block_as_matrix( +AES_StatusCode aes_format_block_as_matrix( AES_BlockMatrixString*, const AES_Block*, AES_ErrorDetails* ); -static inline AES_StatusCode aes128_format_block_as_matrix( - AES128_BlockMatrixString* dest, - const AES_Block* src, - AES_ErrorDetails* err_details -) { - return aes_AES_format_block_as_matrix(dest, src, err_details); -} +AES_StatusCode aes_print_block(const AES_Block*, AES_ErrorDetails*); -static inline AES_StatusCode aes192_format_block_as_matrix( - AES192_BlockMatrixString* dest, - const AES_Block* src, - AES_ErrorDetails* err_details -) { - return aes_AES_format_block_as_matrix(dest, src, err_details); -} - -static inline AES_StatusCode aes256_format_block_as_matrix( - AES256_BlockMatrixString* dest, - const AES_Block* src, - AES_ErrorDetails* err_details -) { - return aes_AES_format_block_as_matrix(dest, src, err_details); -} - -AES_StatusCode aes_AES_print_block(const AES_Block*, AES_ErrorDetails*); - -static inline AES_StatusCode aes128_print_block( - const AES_Block* block, - AES_ErrorDetails* err_details -) { - return aes_AES_print_block(block, err_details); -} - -static inline AES_StatusCode aes192_print_block( - const AES_Block* block, - AES_ErrorDetails* err_details -) { - return aes_AES_print_block(block, err_details); -} +AES_StatusCode aes_print_block_as_matrix(const AES_Block*, AES_ErrorDetails*); -static inline AES_StatusCode aes256_print_block( - const AES_Block* block, - AES_ErrorDetails* err_details -) { - return aes_AES_print_block(block, err_details); -} - -AES_StatusCode aes_AES_print_block_as_matrix(const AES_Block*, AES_ErrorDetails*); - -static inline AES_StatusCode aes128_print_block_as_matrix( - const AES_Block* block, - AES_ErrorDetails* err_details -) { - return aes_AES_print_block_as_matrix(block, err_details); -} - -static inline AES_StatusCode aes192_print_block_as_matrix( - const AES_Block* block, - AES_ErrorDetails* err_details -) { - return aes_AES_print_block_as_matrix(block, err_details); -} - -static inline AES_StatusCode aes256_print_block_as_matrix( - const AES_Block* block, - AES_ErrorDetails* err_details -) { - return aes_AES_print_block_as_matrix(block, err_details); -} - -AES_StatusCode aes_AES_parse_block(AES_Block* dest, const char* src, AES_ErrorDetails* err_details); - -static inline AES_StatusCode aes128_parse_block( - AES_Block* dest, - const char* src, - AES_ErrorDetails* err_details -) { - return aes_AES_parse_block(dest, src, err_details); -} - -static inline AES_StatusCode aes192_parse_block( - AES_Block* dest, - const char* src, - AES_ErrorDetails* err_details -) { - return aes_AES_parse_block(dest, src, err_details); -} - -static inline AES_StatusCode aes256_parse_block( - AES_Block* dest, - const char* src, - AES_ErrorDetails* err_details -) { - return aes_AES_parse_block(dest, src, err_details); -} +AES_StatusCode aes_parse_block(AES_Block* dest, const char* src, AES_ErrorDetails* err_details); typedef struct { char str[33]; diff --git a/aes/src/aes.c b/aes/src/aes.c index e2db120..999bdf1 100644 --- a/aes/src/aes.c +++ b/aes/src/aes.c @@ -11,7 +11,7 @@ #include #include -AES_StatusCode aes_AES_format_block( +AES_StatusCode aes_format_block( AES_BlockString* str, const AES_Block* block, AES_ErrorDetails* err_details @@ -36,7 +36,7 @@ AES_StatusCode aes_AES_format_block( return AES_SUCCESS; } -AES_StatusCode aes_AES_format_block_as_matrix( +AES_StatusCode aes_format_block_as_matrix( AES_BlockMatrixString* str, const AES_Block* block, AES_ErrorDetails* err_details @@ -64,7 +64,7 @@ AES_StatusCode aes_AES_format_block_as_matrix( return AES_SUCCESS; } -AES_StatusCode aes_AES_print_block(const AES_Block* block, AES_ErrorDetails* err_details) { +AES_StatusCode aes_print_block(const AES_Block* block, AES_ErrorDetails* err_details) { assert(block); if (block == NULL) @@ -73,17 +73,14 @@ AES_StatusCode aes_AES_print_block(const AES_Block* block, AES_ErrorDetails* err AES_StatusCode ec = AES_SUCCESS; AES_BlockString str; - if (aes_is_error(ec = aes_AES_format_block(&str, block, err_details))) + if (aes_is_error(ec = aes_format_block(&str, block, err_details))) return ec; printf("%s\n", str.str); return ec; } -AES_StatusCode aes_AES_print_block_as_matrix( - const AES_Block* block, - AES_ErrorDetails* err_details -) { +AES_StatusCode aes_print_block_as_matrix(const AES_Block* block, AES_ErrorDetails* err_details) { assert(block); if (block == NULL) @@ -92,18 +89,14 @@ AES_StatusCode aes_AES_print_block_as_matrix( AES_StatusCode ec = AES_SUCCESS; AES_BlockMatrixString str; - if (aes_is_error(ec = aes_AES_format_block_as_matrix(&str, block, err_details))) + if (aes_is_error(ec = aes_format_block_as_matrix(&str, block, err_details))) return ec; printf("%s", str.str); return ec; } -AES_StatusCode aes_AES_parse_block( - AES_Block* dest, - const char* src, - AES_ErrorDetails* err_details -) { +AES_StatusCode aes_parse_block(AES_Block* dest, const char* src, AES_ErrorDetails* err_details) { assert(dest); assert(src); @@ -225,7 +218,7 @@ AES_StatusCode aes256_format_key( } AES_StatusCode aes128_print_key(const AES128_Key* key, AES_ErrorDetails* err_details) { - return aes_AES_print_block(&key->key, err_details); + return aes_print_block(&key->key, err_details); } AES_StatusCode aes192_print_key(const AES192_Key* key, AES_ErrorDetails* err_details) { @@ -261,7 +254,7 @@ AES_StatusCode aes256_print_key(const AES256_Key* key, AES_ErrorDetails* err_det } AES_StatusCode aes128_parse_key(AES128_Key* dest, const char* src, AES_ErrorDetails* err_details) { - return aes_AES_parse_block(&dest->key, src, err_details); + return aes_parse_block(&dest->key, src, err_details); } AES_StatusCode aes192_parse_key(AES192_Key* dest, const char* src, AES_ErrorDetails* err_details) { diff --git a/aesxx/include/aesxx/aes.hpp b/aesxx/include/aesxx/aes.hpp index 6271b24..fb42cdf 100644 --- a/aesxx/include/aesxx/aes.hpp +++ b/aesxx/include/aesxx/aes.hpp @@ -34,20 +34,20 @@ struct Types { template <> inline void from_string(aes128::Block& dest, std::string_view src) { - aes128_parse_block(&dest, src.data(), ErrorDetailsThrowsInDestructor{}); + aes_parse_block(&dest, src.data(), ErrorDetailsThrowsInDestructor{}); } template <> inline std::string to_string(const aes128::Block& src) { AES128_BlockString str; - aes128_format_block(&str, &src, ErrorDetailsThrowsInDestructor{}); + aes_format_block(&str, &src, ErrorDetailsThrowsInDestructor{}); return {str.str}; } template <> inline std::string to_matrix_string(const aes128::Block& src) { AES128_BlockMatrixString str; - aes128_format_block_as_matrix(&str, &src, ErrorDetailsThrowsInDestructor{}); + aes_format_block_as_matrix(&str, &src, ErrorDetailsThrowsInDestructor{}); return {str.str}; } @@ -104,20 +104,20 @@ struct Types { template <> inline void from_string(aes192::Block& dest, std::string_view src) { - aes192_parse_block(&dest, src.data(), ErrorDetailsThrowsInDestructor{}); + aes_parse_block(&dest, src.data(), ErrorDetailsThrowsInDestructor{}); } template <> inline std::string to_string(const aes192::Block& src) { AES192_BlockString str; - aes192_format_block(&str, &src, ErrorDetailsThrowsInDestructor{}); + aes_format_block(&str, &src, ErrorDetailsThrowsInDestructor{}); return {str.str}; } template <> inline std::string to_matrix_string(const aes192::Block& src) { AES192_BlockMatrixString str; - aes192_format_block_as_matrix(&str, &src, ErrorDetailsThrowsInDestructor{}); + aes_format_block_as_matrix(&str, &src, ErrorDetailsThrowsInDestructor{}); return {str.str}; } @@ -174,20 +174,20 @@ struct Types { template <> inline void from_string(aes256::Block& dest, std::string_view src) { - aes256_parse_block(&dest, src.data(), ErrorDetailsThrowsInDestructor{}); + aes_parse_block(&dest, src.data(), ErrorDetailsThrowsInDestructor{}); } template <> inline std::string to_string(const aes256::Block& src) { AES256_BlockString str; - aes256_format_block(&str, &src, ErrorDetailsThrowsInDestructor{}); + aes_format_block(&str, &src, ErrorDetailsThrowsInDestructor{}); return {str.str}; } template <> inline std::string to_matrix_string(const aes256::Block& src) { AES256_BlockMatrixString str; - aes256_format_block_as_matrix(&str, &src, ErrorDetailsThrowsInDestructor{}); + aes_format_block_as_matrix(&str, &src, ErrorDetailsThrowsInDestructor{}); return {str.str}; } diff --git a/aesxx/include/aesxx/box.hpp b/aesxx/include/aesxx/box.hpp index 5bd17de..e34c241 100644 --- a/aesxx/include/aesxx/box.hpp +++ b/aesxx/include/aesxx/box.hpp @@ -31,12 +31,12 @@ public: static std::string format_block(const Block& src) { AES_BlockString str; - aes_AES_format_block(&str, &src, ErrorDetailsThrowsInDestructor{}); + aes_format_block(&str, &src, ErrorDetailsThrowsInDestructor{}); return reinterpret_cast(&str); } static void parse_block(Block& dest, std::string_view src) { - aes_AES_parse_block(&dest, src.data(), ErrorDetailsThrowsInDestructor{}); + aes_parse_block(&dest, src.data(), ErrorDetailsThrowsInDestructor{}); } static void parse_key(Key& dest, Algorithm algorithm, std::string_view src) { -- cgit v1.3