diff options
| author | Egor Tensin <egor@tensin.name> | 2026-06-18 18:22:01 +0200 |
|---|---|---|
| committer | Egor Tensin <egor@tensin.name> | 2026-06-18 19:21:44 +0200 |
| commit | 2342ade23c3e8a8855cfb55f9b15818978bfb333 (patch) | |
| tree | b13bb6ad104288bcfaeedef1d02e37e427024a3d /aesxx/utils | |
| parent | Revert "cmake: treat warnings as errors" (diff) | |
| download | aes-tools-2342ade23c3e8a8855cfb55f9b15818978bfb333.tar.gz aes-tools-2342ade23c3e8a8855cfb55f9b15818978bfb333.zip | |
switch to if constexpr (..) to remove clutter
Diffstat (limited to 'aesxx/utils')
| -rw-r--r-- | aesxx/utils/block_dumper.hpp | 30 | ||||
| -rw-r--r-- | aesxx/utils/decrypt_block.cpp | 2 | ||||
| -rw-r--r-- | aesxx/utils/encrypt_block.cpp | 2 |
3 files changed, 10 insertions, 24 deletions
diff --git a/aesxx/utils/block_dumper.hpp b/aesxx/utils/block_dumper.hpp index f05d41c..8284b67 100644 --- a/aesxx/utils/block_dumper.hpp +++ b/aesxx/utils/block_dumper.hpp @@ -70,30 +70,16 @@ void dump_wrapper(const aes::DecryptWrapper<algorithm, mode>& wrapper) { dump_decryption_keys<algorithm>(wrapper.decryption_keys); } -template < - aes::Algorithm algorithm, - aes::Mode mode, - typename std::enable_if<aes::ModeRequiresInitVector<mode>::value>::type* = nullptr> +template <aes::Algorithm algorithm, aes::Mode mode> void dump_next_iv(const aes::EncryptWrapper<algorithm, mode>& wrapper) { - dump_block<algorithm>("Next initialization vector", wrapper.iv); + if constexpr (aes::mode_requires_init_vector(mode)) { + dump_block<algorithm>("Next initialization vector", wrapper.iv); + } } -template < - aes::Algorithm algorithm, - aes::Mode mode, - typename std::enable_if<!aes::ModeRequiresInitVector<mode>::value>::type* = nullptr> -void dump_next_iv(const aes::EncryptWrapper<algorithm, mode>&) {} - -template < - aes::Algorithm algorithm, - aes::Mode mode, - typename std::enable_if<aes::ModeRequiresInitVector<mode>::value>::type* = nullptr> +template <aes::Algorithm algorithm, aes::Mode mode> void dump_next_iv(const aes::DecryptWrapper<algorithm, mode>& wrapper) { - dump_block<algorithm>("Next initialization vector", wrapper.iv); + if constexpr (aes::mode_requires_init_vector(mode)) { + dump_block<algorithm>("Next initialization vector", wrapper.iv); + } } - -template < - aes::Algorithm algorithm, - aes::Mode mode, - typename std::enable_if<!aes::ModeRequiresInitVector<mode>::value>::type* = nullptr> -void dump_next_iv(const aes::DecryptWrapper<algorithm, mode>&) {} diff --git a/aesxx/utils/decrypt_block.cpp b/aesxx/utils/decrypt_block.cpp index 317e6fd..f06221d 100644 --- a/aesxx/utils/decrypt_block.cpp +++ b/aesxx/utils/decrypt_block.cpp @@ -23,7 +23,7 @@ template <aes::Algorithm algorithm, aes::Mode mode> void decrypt_with_mode(const Input& input, bool verbose = false) { typename aes::Types<algorithm>::Block iv; - if (aes::ModeRequiresInitVector<mode>()) { + if constexpr (aes::mode_requires_init_vector(mode)) { aes::from_string<algorithm>(iv, input.iv); if (verbose) dump_iv<algorithm>(iv); diff --git a/aesxx/utils/encrypt_block.cpp b/aesxx/utils/encrypt_block.cpp index 5fdefd0..6bde766 100644 --- a/aesxx/utils/encrypt_block.cpp +++ b/aesxx/utils/encrypt_block.cpp @@ -23,7 +23,7 @@ template <aes::Algorithm algorithm, aes::Mode mode> void encrypt_with_mode(const Input& input, bool verbose = false) { typename aes::Types<algorithm>::Block iv; - if (aes::ModeRequiresInitVector<mode>::value) { + if constexpr (aes::mode_requires_init_vector(mode)) { aes::from_string<algorithm>(iv, input.iv); if (verbose) dump_iv<algorithm>(iv); |