3 files changed, 24 insertions, 11 deletions
diff --git a/aesxx/utils/decrypt_block.cpp b/aesxx/utils/decrypt_block.cpp
index c27afd6..9f9ee2a 100644
--- a/aesxx/utils/decrypt_block.cpp
+++ b/aesxx/utils/decrypt_block.cpp
@@ -17,11 +17,16 @@
 
 namespace {
 
-void decrypt_blocks(aes::Algorithm algorithm, aes::Mode mode, const BlockSettings::Input& input) {
+void decrypt_blocks(
+    aes::Algorithm algorithm,
+    aes::Mode mode,
+    const BlockSettings::Input& input,
+    bool verbose = false
+) {
     aes::Box::Key key;
     aes::Box::parse_key(key, algorithm, input.get_key());
 
-    aes::Box box{algorithm, key, mode, input.get_iv()};
+    aes::Box box{algorithm, key, mode, input.get_iv(), verbose};
 
     for (const auto& ciphertext : input.get_blocks()) {
         aes::Block plaintext;
@@ -49,7 +54,9 @@ int main(int argc, char** argv) {
         }
 
         for (const auto& input : settings.get_inputs()) {
-            decrypt_blocks(settings.get_algorithm(), settings.get_mode(), input);
+            decrypt_blocks(
+                settings.get_algorithm(), settings.get_mode(), input, settings.get_verbose()
+            );
         }
     } catch (const aes::Error& e) {
         std::cerr << e;
diff --git a/aesxx/utils/encrypt_block.cpp b/aesxx/utils/encrypt_block.cpp
index 246218a..5f84922 100644
--- a/aesxx/utils/encrypt_block.cpp
+++ b/aesxx/utils/encrypt_block.cpp
@@ -17,11 +17,16 @@
 
 namespace {
 
-void encrypt_blocks(aes::Algorithm algorithm, aes::Mode mode, const BlockSettings::Input& input) {
+void encrypt_blocks(
+    aes::Algorithm algorithm,
+    aes::Mode mode,
+    const BlockSettings::Input& input,
+    bool verbose = false
+) {
     aes::Box::Key key;
     aes::Box::parse_key(key, algorithm, input.get_key());
 
-    aes::Box box{algorithm, key, mode, input.get_iv()};
+    aes::Box box{algorithm, key, mode, input.get_iv(), verbose};
 
     for (const auto& plaintext : input.get_blocks()) {
         aes::Block ciphertext;
@@ -49,7 +54,9 @@ int main(int argc, char** argv) {
         }
 
         for (const auto& input : settings.get_inputs()) {
-            encrypt_blocks(settings.get_algorithm(), settings.get_mode(), input);
+            encrypt_blocks(
+                settings.get_algorithm(), settings.get_mode(), input, settings.get_verbose()
+            );
         }
     } catch (const aes::Error& e) {
         std::cerr << e;
diff --git a/aesxx/utils/helpers/cmd_parser_block.hpp b/aesxx/utils/helpers/cmd_parser_block.hpp
index b463656..e8ba1b6 100644
--- a/aesxx/utils/helpers/cmd_parser_block.hpp
+++ b/aesxx/utils/helpers/cmd_parser_block.hpp
@@ -52,7 +52,7 @@ public:
     explicit BlockSettings(std::string_view argv0) : SettingsParser{argv0} {
         namespace po = boost::program_options;
 
-        visible.add_options()("verbose,v", po::bool_switch(&_verbose), "enable verbose output");
+        visible.add_options()("verbose,v", po::bool_switch(&verbose), "enable verbose output");
         visible.add_options()(
             "algorithm,a", po::value(&algorithm)->required()->value_name("NAME"), "set algorithm"
         );
@@ -94,8 +94,8 @@ public:
         return inputs;
     }
 
-    bool verbose() const {
-        return _verbose;
+    bool get_verbose() const {
+        return verbose;
     }
 
 private:
@@ -140,6 +140,5 @@ private:
     aes::Algorithm algorithm;
     aes::Mode mode;
     std::vector<Input> inputs;
-
-    bool _verbose = false;
+    bool verbose = false;
 };