move executables from test/ to utils/

13 files changed, 33 insertions, 2 deletions

diff --git a/utils/file/CMakeLists.txt b/utils/file/CMakeLists.txt
new file mode 100644
index 0000000..ad949f7
--- /dev/null
+++ b/utils/file/CMakeLists.txt
@@ -0,0 +1,10 @@
+macro(util prefix)
+    add_executable(util_${prefix} ${prefix}.cpp)
+    target_link_libraries(util_${prefix} libaesnixx libaesni)
+    set_target_properties(util_${prefix} PROPERTIES OUTPUT_NAME ${prefix})
+endmacro()
+
+util(aes128ecb_encrypt_file)
+util(aes128ecb_decrypt_file)
+
+add_subdirectory(cxx)
diff --git a/utils/aes128ecb_decrypt_file.cpp b/utils/file/aes128ecb_decrypt_file.cpp
index 9b8b15c..9b8b15c 100644
--- a/utils/aes128ecb_decrypt_file.cpp
+++ b/utils/file/aes128ecb_decrypt_file.cpp
diff --git a/utils/aes128ecb_encrypt_file.cpp b/utils/file/aes128ecb_encrypt_file.cpp
index a43c4d9..a43c4d9 100644
--- a/utils/aes128ecb_encrypt_file.cpp
+++ b/utils/file/aes128ecb_encrypt_file.cpp
diff --git a/utils/file/cxx/CMakeLists.txt b/utils/file/cxx/CMakeLists.txt
new file mode 100644
index 0000000..75895a0
--- /dev/null
+++ b/utils/file/cxx/CMakeLists.txt
@@ -0,0 +1,21 @@
+find_package(Boost REQUIRED COMPONENTS program_options)
+
+add_executable(util_aes_encrypt_file aes_encrypt_file.cpp aes_common.hpp)
+target_include_directories(util_aes_encrypt_file PRIVATE ${Boost_INCLUDE_DIRS})
+target_link_libraries(util_aes_encrypt_file libaesni libaesnixx ${Boost_LIBRARIES})
+set_target_properties(util_aes_encrypt_file PROPERTIES OUTPUT_NAME aes_encrypt_file)
+
+add_executable(util_aes_decrypt_file aes_decrypt_file.cpp aes_common.hpp)
+target_include_directories(util_aes_decrypt_file PRIVATE ${Boost_INCLUDE_DIRS})
+target_link_libraries(util_aes_decrypt_file libaesni libaesnixx ${Boost_LIBRARIES})
+set_target_properties(util_aes_decrypt_file PROPERTIES OUTPUT_NAME aes_decrypt_file)
+
+add_executable(util_aes_encrypt_bmp aes_encrypt_bmp.cpp aes_common.hpp)
+target_include_directories(util_aes_encrypt_bmp PRIVATE ${Boost_INCLUDE_DIRS})
+target_link_libraries(util_aes_encrypt_bmp libaesni libaesnixx ${Boost_LIBRARIES})
+set_target_properties(util_aes_encrypt_bmp PROPERTIES OUTPUT_NAME aes_encrypt_bmp)
+
+add_executable(util_aes_decrypt_bmp aes_decrypt_bmp.cpp aes_common.hpp)
+target_include_directories(util_aes_decrypt_bmp PRIVATE ${Boost_INCLUDE_DIRS})
+target_link_libraries(util_aes_decrypt_bmp libaesni libaesnixx ${Boost_LIBRARIES})
+set_target_properties(util_aes_decrypt_bmp PROPERTIES OUTPUT_NAME aes_decrypt_bmp)
diff --git a/utils/README.md b/utils/file/cxx/README.md
index ec23774..bf79cb2 100644
--- a/utils/README.md
+++ b/utils/file/cxx/README.md
@@ -1,6 +1,6 @@
-# Utilities
+# File encryption utilities
 
-Here are a couple of useful utilities built on top of the library.
+Here are a couple of useful file encryption utilities built on top of the library.
 Each of the utilities accepts `--help` flag, which can be used to examine utility's usage info.
 
 The included utilities are:
diff --git a/utils/aes_common.hpp b/utils/file/cxx/aes_common.hpp
index c15565f..c15565f 100644
--- a/utils/aes_common.hpp
+++ b/utils/file/cxx/aes_common.hpp
diff --git a/utils/aes_decrypt_bmp.cpp b/utils/file/cxx/aes_decrypt_bmp.cpp
index 85dffe5..85dffe5 100644
--- a/utils/aes_decrypt_bmp.cpp
+++ b/utils/file/cxx/aes_decrypt_bmp.cpp
diff --git a/utils/aes_decrypt_file.cpp b/utils/file/cxx/aes_decrypt_file.cpp
index af0d119..af0d119 100644
--- a/utils/aes_decrypt_file.cpp
+++ b/utils/file/cxx/aes_decrypt_file.cpp
diff --git a/utils/aes_encrypt_bmp.cpp b/utils/file/cxx/aes_encrypt_bmp.cpp
index cf55b0b..cf55b0b 100644
--- a/utils/aes_encrypt_bmp.cpp
+++ b/utils/file/cxx/aes_encrypt_bmp.cpp
diff --git a/utils/aes_encrypt_file.cpp b/utils/file/cxx/aes_encrypt_file.cpp
index 0b367d9..0b367d9 100644
--- a/utils/aes_encrypt_file.cpp
+++ b/utils/file/cxx/aes_encrypt_file.cpp
diff --git a/utils/bmp/butterfly.bmp b/utils/file/cxx/bmp/butterfly.bmp
index 105a55a..105a55a 100644
--- a/utils/bmp/butterfly.bmp
+++ b/utils/file/cxx/bmp/butterfly.bmp
diff --git a/utils/bmp/cipherfly_cbc.bmp b/utils/file/cxx/bmp/cipherfly_cbc.bmp
index 664b557..664b557 100644
--- a/utils/bmp/cipherfly_cbc.bmp
+++ b/utils/file/cxx/bmp/cipherfly_cbc.bmp
diff --git a/utils/bmp/cipherfly_ecb.bmp b/utils/file/cxx/bmp/cipherfly_ecb.bmp
index 78de9a8..78de9a8 100644
--- a/utils/bmp/cipherfly_ecb.bmp
+++ b/utils/file/cxx/bmp/cipherfly_ecb.bmp