aesxx: refactoring

1 files changed, 19 insertions, 12 deletions

diff --git a/aesxx/utils/decrypt_block.cpp b/aesxx/utils/decrypt_block.cpp
index bcd3381..f6bd8a3 100644
--- a/aesxx/utils/decrypt_block.cpp
+++ b/aesxx/utils/decrypt_block.cpp
@@ -4,7 +4,6 @@
 // Distributed under the MIT License.
 
 #include "helpers/block_dumper.hpp"
-#include "helpers/block_input.hpp"
 #include "helpers/cmd_parser_block.hpp"
 
 #include <aesxx/all.hpp>
@@ -20,18 +19,18 @@
 namespace {
 
 template <aes::Algorithm algorithm, aes::Mode mode>
-void decrypt_with_mode(const Input& input, bool verbose = false) {
+void decrypt_with_mode(const BlockSettings::Input& input, bool verbose = false) {
     typename aes::Types<algorithm>::Block iv;
     aes::make_block(iv, 0, 0, 0, 0);
 
     if constexpr (aes::mode_requires_init_vector(mode)) {
-        aes::from_string<algorithm>(iv, input.iv);
+        aes::from_string<algorithm>(iv, input.get_iv());
         if (verbose)
             dump_iv<algorithm>(iv);
     }
 
     typename aes::Types<algorithm>::Key key;
-    aes::from_string<algorithm>(key, input.key);
+    aes::from_string<algorithm>(key, input.get_key());
     if (verbose)
         dump_key<algorithm>(key);
 
@@ -39,7 +38,7 @@ void decrypt_with_mode(const Input& input, bool verbose = false) {
     if (verbose)
         dump_wrapper<algorithm, mode>(decrypt);
 
-    for (const auto& block : input.blocks) {
+    for (const auto& block : input.get_blocks()) {
         typename aes::Types<algorithm>::Block ciphertext, plaintext;
         aes::from_string<algorithm>(ciphertext, block);
 
@@ -56,7 +55,11 @@ void decrypt_with_mode(const Input& input, bool verbose = false) {
 }
 
 template <aes::Algorithm algorithm>
-void decrypt_with_algorithm(aes::Mode mode, const Input& input, bool verbose = false) {
+void decrypt_with_algorithm(
+    aes::Mode mode,
+    const BlockSettings::Input& input,
+    bool verbose = false
+) {
     switch (mode) {
         case AES_ECB:
             decrypt_with_mode<algorithm, AES_ECB>(input, verbose);
@@ -87,7 +90,7 @@ void decrypt_with_algorithm(aes::Mode mode, const Input& input, bool verbose = f
 void decrypt_using_cxx_api(
     aes::Algorithm algorithm,
     aes::Mode mode,
-    const Input& input,
+    const BlockSettings::Input& input,
     bool verbose = false
 ) {
     switch (algorithm) {
@@ -120,19 +123,23 @@ void decrypt_using_particular_box(aes::Box& box, const std::vector<std::string>&
     }
 }
 
-void decrypt_using_boxes(aes::Algorithm algorithm, aes::Mode mode, const Input& input) {
+void decrypt_using_boxes(
+    aes::Algorithm algorithm,
+    aes::Mode mode,
+    const BlockSettings::Input& input
+) {
     aes::Box::Key key;
-    aes::Box::parse_key(key, algorithm, input.key);
+    aes::Box::parse_key(key, algorithm, input.get_key());
 
     if (aes::mode_requires_init_vector(mode)) {
         aes::Box::Block iv;
-        aes::Box::parse_block(iv, algorithm, input.iv);
+        aes::Box::parse_block(iv, algorithm, input.get_iv());
         aes::Box box{algorithm, key, mode, iv};
 
-        decrypt_using_particular_box(box, input.blocks);
+        decrypt_using_particular_box(box, input.get_blocks());
     } else {
         aes::Box box{algorithm, key};
-        decrypt_using_particular_box(box, input.blocks);
+        decrypt_using_particular_box(box, input.get_blocks());
     }
 }