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 --- aesxx/include/aesxx/aes.hpp | 18 +++++++++--------- aesxx/include/aesxx/box.hpp | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'aesxx/include') 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