utils: rearrange files

5 files changed, 2 insertions, 73 deletions

diff --git a/utils/block/aes_common.hpp b/utils/aes_block_common.hpp
index 327efad..327efad 100644
--- a/utils/block/aes_common.hpp
+++ b/utils/aes_block_common.hpp
diff --git a/utils/block/aes_decrypt_block.cpp b/utils/aes_decrypt_block.cpp
index a8a39f4..778aecb 100644
--- a/utils/block/aes_decrypt_block.cpp
+++ b/utils/aes_decrypt_block.cpp
@@ -6,7 +6,7 @@
  *            See LICENSE.txt for details.
  */
 
-#include "aes_common.hpp"
+#include "aes_block_common.hpp"
 
 #include <aesni/all.h>
 
diff --git a/utils/block/aes_encrypt_block.cpp b/utils/aes_encrypt_block.cpp
index 3b0e837..89e935b 100644
--- a/utils/block/aes_encrypt_block.cpp
+++ b/utils/aes_encrypt_block.cpp
@@ -6,7 +6,7 @@
  *            See LICENSE.txt for details.
  */
 
-#include "aes_common.hpp"
+#include "aes_block_common.hpp"
 
 #include <aesni/all.h>
 
diff --git a/utils/block/CMakeLists.txt b/utils/block/CMakeLists.txt
deleted file mode 100644
index 8df91d0..0000000
--- a/utils/block/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/README.md b/utils/block/README.md
deleted file mode 100644
index bce2434..0000000
--- a/utils/block/README.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# Block encryption utilities
-
-Here are a couple of useful block 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.
-
-On older CPUs, you can run the utilities [using Intel SDE](https://github.com/egor-tensin/aesni#running-on-older-cpus).
-
-## aes_encrypt_block.exe
-
-Encrypts 16-byte blocks using AES-128/192/256 in the specified mode of operation.
-
-### Usage examples
-
-For example, to encrypt
-
-* the plaintext block `0x00112233445566778899aabbccddeeff`
-* using AES-128 in ECB mode
-* with key `0x000102030405060708090a0b0c0d0e0f`,
-
-run:
-
-    aes_encrypt_block.exe -a aes128 -m ecb 000102030405060708090a0b0c0d0e0f 00112233445566778899aabbccddeeff
-
-To encrypt
-
-* the plaintext block `0x00112233445566778899aabbccddeeff`
-* using AES-192 in OFB mode
-* with initialization vector `0x22222222222222222222222222222222`
-* and key `0x000102030405060708090a0b0c0d0e0f101112131415161718`,
-
-run:
-
-    aes_encrypt_block.exe -a aes192 -m ofb 000102030405060708090a0b0c0d0e0f101112131415161718 22222222222222222222222222222222 00112233445566778899aabbccddeeff
-
-## aes_decrypt_block.exe
-
-Decrypts 16-byte blocks using AES-128/192/256 in the specified mode of operation.
-
-### Usage examples
-
-For example, to decrypt
-
-* the ciphertext block `0x69c4e0d86a7b0430d8cdb78070b4c55a`
-* using AES-128 in ECB mode
-* with key `0x000102030405060708090a0b0c0d0e0f`,
-
-run:
-
-    aes_decrypt_block.exe -a aes128 -m ecb 000102030405060708090a0b0c0d0e0f 69c4e0d86a7b0430d8cdb78070b4c55a
-
-To decrypt
-
-* the ciphertext block `0x762a5ab50929189cefdb99434790aad8`
-* using AES-192 in OFB mode
-* with initialization vector `0x22222222222222222222222222222222`
-* and key `0x000102030405060708090a0b0c0d0e0f101112131415161718`,
-
-run:
-
-    aes_decrypt_block.exe -a aes192 -m ofb 000102030405060708090a0b0c0d0e0f101112131415161718 22222222222222222222222222222222 bda298884f5c3a9eb7068aa7063a3b75