aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/aesxx
diff options
context:
space:
mode:
authorEgor Tensin <egor@tensin.name>2026-07-21 15:14:59 +0200
committerEgor Tensin <egor@tensin.name>2026-07-21 15:14:59 +0200
commit3a1cc6ad7e6b4d924973c8ee2689746d5ca98818 (patch)
tree4384d5c03c9c697f6f7bdf10984d3243e5fd18b3 /aesxx
parentblocks are the same for every variant (diff)
downloadaes-tools-3a1cc6ad7e6b4d924973c8ee2689746d5ca98818.tar.gz
aes-tools-3a1cc6ad7e6b4d924973c8ee2689746d5ca98818.zip
remove more stupid crap
Diffstat (limited to 'aesxx')
-rw-r--r--aesxx/include/aesxx/aes.hpp18
-rw-r--r--aesxx/include/aesxx/box.hpp4
2 files changed, 11 insertions, 11 deletions
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<AES_AES128> {
template <>
inline void from_string<AES_AES128>(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<AES_AES128>(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<AES_AES128>(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<AES_AES192> {
template <>
inline void from_string<AES_AES192>(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<AES_AES192>(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<AES_AES192>(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<AES_AES256> {
template <>
inline void from_string<AES_AES256>(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<AES_AES256>(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<AES_AES256>(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<const char*>(&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) {