merge specialized block utils into general ones

... taking advantage of the new template interface.

5 files changed, 8 insertions, 255 deletions

diff --git a/utils/block/cxx/README.md b/utils/block/README.md
index bce2434..bce2434 100644
--- a/utils/block/cxx/README.md
+++ b/utils/block/README.md
diff --git a/utils/block/cxx/aes_common.hpp b/utils/block/aes_common.hpp
index cd5d669..327efad 100644
--- a/utils/block/cxx/aes_common.hpp
+++ b/utils/block/aes_common.hpp
@@ -68,6 +68,7 @@ namespace
         CommandLineParser(const std::string& program_name)
             : m_program_name(program_name)
             , m_options("Options")
+            , m_boxes(false)
         { }
 
         bool parse_options(int argc, char** argv)
@@ -76,6 +77,7 @@ namespace
 
             m_options.add_options()
                 ("help,h", "show this message and exit")
+                ("box,b", po::bool_switch(&m_boxes)->default_value(false), "use the \"boxes\" interface")
                 ("mode,m", po::value<aesni::Mode>(&m_mode)->required(), "set mode of operation")
                 ("algorithm,a", po::value<aesni::Algorithm>(&m_algorithm)->required(), "set algorithm");
 
@@ -118,6 +120,11 @@ namespace
             return m_algorithm;
         }
 
+        bool use_boxes() const
+        {
+            return m_boxes;
+        }
+
         std::deque<std::string> get_args()
         {
             return { std::make_move_iterator(m_args.begin()), std::make_move_iterator(m_args.end()) };
@@ -129,6 +136,7 @@ namespace
 
         aesni::Mode m_mode;
         aesni::Algorithm m_algorithm;
+        bool m_boxes;
         std::vector<std::string> m_args;
     };
 }
diff --git a/utils/block/cxx/CMakeLists.txt b/utils/block/cxx/CMakeLists.txt
deleted file mode 100644
index 8df91d0..0000000
--- a/utils/block/cxx/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-find_package(Boost REQUIRED COMPONENTS program_options)
-
-add_executable(util_aes_encrypt_block aes_encrypt_block.cpp aes_common.hpp)
-target_include_directories(util_aes_encrypt_block PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries(util_aes_encrypt_block libaesni libaesnixx ${Boost_LIBRARIES})
-set_target_properties(util_aes_encrypt_block PROPERTIES OUTPUT_NAME aes_encrypt_block)
-
-add_executable(util_aes_decrypt_block aes_decrypt_block.cpp aes_common.hpp)
-target_include_directories(util_aes_decrypt_block PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries(util_aes_decrypt_block libaesni libaesnixx ${Boost_LIBRARIES})
-set_target_properties(util_aes_decrypt_block PROPERTIES OUTPUT_NAME aes_decrypt_block)
diff --git a/utils/block/cxx/aes_decrypt_block.cpp b/utils/block/cxx/aes_decrypt_block.cpp
deleted file mode 100644
index 835d945..0000000
--- a/utils/block/cxx/aes_decrypt_block.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/**
- * \file
- * \author Egor Tensin <Egor.Tensin@gmail.com>
- * \date 2015
- * \copyright This file is licensed under the terms of the MIT License.
- *            See LICENSE.txt for details.
- */
-
-#include "aes_common.hpp"
-
-#include <aesni/all.h>
-
-#include <aesnixx/all.hpp>
-
-#include <exception>
-#include <iostream>
-
-int main(int argc, char** argv)
-{
-    try
-    {
-        CommandLineParser cmd_parser("aes_encrypt_block.exe");
-
-        if (!cmd_parser.parse_options(argc, argv))
-            return 0;
-
-        auto args = cmd_parser.get_args();
-
-        while (!args.empty())
-        {
-            AesNI_BoxAlgorithmParams algorithm_params;
-
-            switch (cmd_parser.get_algorithm())
-            {
-                case AESNI_AES128:
-                    aesni::aes::from_string(algorithm_params.aes128_key, args.front());
-                    break;
-
-                case AESNI_AES192:
-                    aesni::aes::from_string(algorithm_params.aes192_key, args.front());
-                    break;
-
-                case AESNI_AES256:
-                    aesni::aes::from_string(algorithm_params.aes256_key, args.front());
-                    break;
-            }
-
-            args.pop_front();
-
-            AesNI_BoxBlock iv;
-            AesNI_BoxBlock* iv_ptr = nullptr;
-
-            switch (cmd_parser.get_mode())
-            {
-                case AESNI_ECB:
-                    break;
-
-                case AESNI_CBC:
-                case AESNI_CFB:
-                case AESNI_OFB:
-                case AESNI_CTR:
-                    if (args.empty())
-                    {
-                        cmd_parser.print_usage();
-                        return 1;
-                    }
-                    aesni::aes::from_string(iv.aes_block, args.front());
-                    iv_ptr = &iv;
-                    args.pop_front();
-                    break;
-            }
-
-            AesNI_Box box;
-            aesni_box_init(
-                &box,
-                cmd_parser.get_algorithm(),
-                &algorithm_params,
-                cmd_parser.get_mode(),
-                iv_ptr,
-                aesni::ErrorDetailsThrowsInDestructor());
-
-            while (!args.empty())
-            {
-                if (args.front() == "--")
-                {
-                    args.pop_front();
-                    break;
-                }
-
-                AesNI_BoxBlock ciphertext;
-                aesni::aes::from_string(ciphertext.aes_block, args.front());
-                args.pop_front();
-
-                AesNI_BoxBlock plaintext;
-                aesni_box_decrypt_block(
-                    &box,
-                    &ciphertext,
-                    &plaintext,
-                    aesni::ErrorDetailsThrowsInDestructor());
-
-                std::cout << aesni::aes::to_string(plaintext.aes_block) << "\n";
-            }
-        }
-
-        return 0;
-    }
-    catch (const boost::program_options::error& e)
-    {
-        std::cerr << "Usage error: " << e.what() << "\n";
-        return 1;
-    }
-    catch (const aesni::Error& e)
-    {
-        std::cerr << e;
-        return 1;
-    }
-    catch (const std::exception& e)
-    {
-        std::cerr << e.what() << "\n";
-        return 1;
-    }
-}
diff --git a/utils/block/cxx/aes_encrypt_block.cpp b/utils/block/cxx/aes_encrypt_block.cpp
deleted file mode 100644
index cd92fa3..0000000
--- a/utils/block/cxx/aes_encrypt_block.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/**
- * \file
- * \author Egor Tensin <Egor.Tensin@gmail.com>
- * \date 2015
- * \copyright This file is licensed under the terms of the MIT License.
- *            See LICENSE.txt for details.
- */
-
-#include "aes_common.hpp"
-
-#include <aesni/all.h>
-
-#include <aesnixx/all.hpp>
-
-#include <exception>
-#include <iostream>
-
-int main(int argc, char** argv)
-{
-    try
-    {
-        CommandLineParser cmd_parser("aes_encrypt_block.exe");
-
-        if (!cmd_parser.parse_options(argc, argv))
-            return 0;
-
-        auto args = cmd_parser.get_args();
-
-        while (!args.empty())
-        {
-            AesNI_BoxAlgorithmParams algorithm_params;
-
-            switch (cmd_parser.get_algorithm())
-            {
-                case AESNI_AES128:
-                    aesni::aes::from_string(algorithm_params.aes128_key, args.front());
-                    break;
-
-                case AESNI_AES192:
-                    aesni::aes::from_string(algorithm_params.aes192_key, args.front());
-                    break;
-
-                case AESNI_AES256:
-                    aesni::aes::from_string(algorithm_params.aes256_key, args.front());
-                    break;
-            }
-
-            args.pop_front();
-
-            AesNI_BoxBlock iv;
-            AesNI_BoxBlock* iv_ptr = nullptr;
-
-            switch (cmd_parser.get_mode())
-            {
-                case AESNI_ECB:
-                    break;
-
-                case AESNI_CBC:
-                case AESNI_CFB:
-                case AESNI_OFB:
-                case AESNI_CTR:
-                    if (args.empty())
-                    {
-                        cmd_parser.print_usage();
-                        return 1;
-                    }
-                    aesni::aes::from_string(iv.aes_block, args.front());
-                    iv_ptr = &iv;
-                    args.pop_front();
-                    break;
-            }
-
-            AesNI_Box box;
-            aesni_box_init(
-                &box,
-                cmd_parser.get_algorithm(),
-                &algorithm_params,
-                cmd_parser.get_mode(),
-                iv_ptr,
-                aesni::ErrorDetailsThrowsInDestructor());
-
-            while (!args.empty())
-            {
-                if (args.front() == "--")
-                {
-                    args.pop_front();
-                    break;
-                }
-
-                AesNI_BoxBlock plaintext;
-                aesni::aes::from_string(plaintext.aes_block, args.front());
-                args.pop_front();
-
-                AesNI_BoxBlock ciphertext;
-                aesni_box_encrypt_block(
-                    &box,
-                    &plaintext,
-                    &ciphertext,
-                    aesni::ErrorDetailsThrowsInDestructor());
-
-                std::cout << aesni::aes::to_string(ciphertext.aes_block) << "\n";
-            }
-        }
-
-        return 0;
-    }
-    catch (const boost::program_options::error& e)
-    {
-        std::cerr << "Usage error: " << e.what() << "\n";
-        return 1;
-    }
-    catch (const aesni::Error& e)
-    {
-        std::cerr << e;
-        return 1;
-    }
-    catch (const std::exception& e)
-    {
-        std::cerr << e.what() << "\n";
-        return 1;
-    }
-}