diff options
-rw-r--r-- | CMakeLists.txt | 1 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | aesxx/CMakeLists.txt | 2 | ||||
-rw-r--r-- | aesxx/utils/CMakeLists.txt (renamed from utils/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | aesxx/utils/README.md (renamed from utils/README.md) | 4 | ||||
-rw-r--r-- | aesxx/utils/block_cmd_parser.hpp (renamed from utils/block_cmd_parser.hpp) | 0 | ||||
-rw-r--r-- | aesxx/utils/block_dumper.hpp (renamed from utils/block_dumper.hpp) | 0 | ||||
-rw-r--r-- | aesxx/utils/block_input.hpp (renamed from utils/block_input.hpp) | 0 | ||||
-rw-r--r-- | aesxx/utils/bmp/butterfly.bmp (renamed from utils/bmp/butterfly.bmp) | bin | 503370 -> 503370 bytes | |||
-rw-r--r-- | aesxx/utils/bmp/cipherfly_cbc.bmp (renamed from utils/bmp/cipherfly_cbc.bmp) | bin | 503382 -> 503382 bytes | |||
-rw-r--r-- | aesxx/utils/bmp/cipherfly_ecb.bmp (renamed from utils/bmp/cipherfly_ecb.bmp) | bin | 503382 -> 503382 bytes | |||
-rw-r--r-- | aesxx/utils/data_parsers.hpp (renamed from utils/data_parsers.hpp) | 0 | ||||
-rw-r--r-- | aesxx/utils/decrypt_block.cpp (renamed from utils/decrypt_block.cpp) | 0 | ||||
-rw-r--r-- | aesxx/utils/decrypt_bmp.cpp (renamed from utils/decrypt_bmp.cpp) | 0 | ||||
-rw-r--r-- | aesxx/utils/decrypt_file.cpp (renamed from utils/decrypt_file.cpp) | 0 | ||||
-rw-r--r-- | aesxx/utils/encrypt_block.cpp (renamed from utils/encrypt_block.cpp) | 0 | ||||
-rw-r--r-- | aesxx/utils/encrypt_bmp.cpp (renamed from utils/encrypt_bmp.cpp) | 0 | ||||
-rw-r--r-- | aesxx/utils/encrypt_file.cpp (renamed from utils/encrypt_file.cpp) | 0 | ||||
-rw-r--r-- | aesxx/utils/file_cmd_parser.hpp (renamed from utils/file_cmd_parser.hpp) | 0 | ||||
-rw-r--r-- | aesxx/utils/helpers/bmp.hpp (renamed from utils/helpers/bmp.hpp) | 0 | ||||
-rw-r--r-- | aesxx/utils/helpers/command_line.hpp (renamed from utils/helpers/command_line.hpp) | 0 | ||||
-rw-r--r-- | aesxx/utils/helpers/file.hpp (renamed from utils/helpers/file.hpp) | 0 |
22 files changed, 5 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ed976f..232aeb7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,5 @@ include(cmake/common.cmake) add_subdirectory(aes) add_subdirectory(aesxx) -add_subdirectory(utils) install(FILES LICENSE.txt DESTINATION share) @@ -55,7 +55,7 @@ See also * [Utilities] * [Testing] -[Utilities]: utils/README.md +[Utilities]: aesxx/utils/README.md [Testing]: test/README.md License diff --git a/aesxx/CMakeLists.txt b/aesxx/CMakeLists.txt index 9bbf777..7f5a58a 100644 --- a/aesxx/CMakeLists.txt +++ b/aesxx/CMakeLists.txt @@ -11,3 +11,5 @@ if(MSVC_VERSION EQUAL 1900) endif() install(DIRECTORY include/aesxx DESTINATION include) + +add_subdirectory(utils) diff --git a/utils/CMakeLists.txt b/aesxx/utils/CMakeLists.txt index 27d3422..27d3422 100644 --- a/utils/CMakeLists.txt +++ b/aesxx/utils/CMakeLists.txt diff --git a/utils/README.md b/aesxx/utils/README.md index 3a8791c..c133c92 100644 --- a/utils/README.md +++ b/aesxx/utils/README.md @@ -154,5 +154,5 @@ See also * [Usage on older CPUs] * [License] -[Usage on older CPUs]: ../README.md#usage-on-older-cpus -[License]: ../README.md#license +[Usage on older CPUs]: ../../README.md#usage-on-older-cpus +[License]: ../../README.md#license diff --git a/utils/block_cmd_parser.hpp b/aesxx/utils/block_cmd_parser.hpp index 58f86d8..58f86d8 100644 --- a/utils/block_cmd_parser.hpp +++ b/aesxx/utils/block_cmd_parser.hpp diff --git a/utils/block_dumper.hpp b/aesxx/utils/block_dumper.hpp index a07d855..a07d855 100644 --- a/utils/block_dumper.hpp +++ b/aesxx/utils/block_dumper.hpp diff --git a/utils/block_input.hpp b/aesxx/utils/block_input.hpp index f629062..f629062 100644 --- a/utils/block_input.hpp +++ b/aesxx/utils/block_input.hpp diff --git a/utils/bmp/butterfly.bmp b/aesxx/utils/bmp/butterfly.bmp Binary files differindex 105a55a..105a55a 100644 --- a/utils/bmp/butterfly.bmp +++ b/aesxx/utils/bmp/butterfly.bmp diff --git a/utils/bmp/cipherfly_cbc.bmp b/aesxx/utils/bmp/cipherfly_cbc.bmp Binary files differindex 664b557..664b557 100644 --- a/utils/bmp/cipherfly_cbc.bmp +++ b/aesxx/utils/bmp/cipherfly_cbc.bmp diff --git a/utils/bmp/cipherfly_ecb.bmp b/aesxx/utils/bmp/cipherfly_ecb.bmp Binary files differindex 78de9a8..78de9a8 100644 --- a/utils/bmp/cipherfly_ecb.bmp +++ b/aesxx/utils/bmp/cipherfly_ecb.bmp diff --git a/utils/data_parsers.hpp b/aesxx/utils/data_parsers.hpp index 1207c7c..1207c7c 100644 --- a/utils/data_parsers.hpp +++ b/aesxx/utils/data_parsers.hpp diff --git a/utils/decrypt_block.cpp b/aesxx/utils/decrypt_block.cpp index 02a3033..02a3033 100644 --- a/utils/decrypt_block.cpp +++ b/aesxx/utils/decrypt_block.cpp diff --git a/utils/decrypt_bmp.cpp b/aesxx/utils/decrypt_bmp.cpp index 9f9cd52..9f9cd52 100644 --- a/utils/decrypt_bmp.cpp +++ b/aesxx/utils/decrypt_bmp.cpp diff --git a/utils/decrypt_file.cpp b/aesxx/utils/decrypt_file.cpp index 6da3d17..6da3d17 100644 --- a/utils/decrypt_file.cpp +++ b/aesxx/utils/decrypt_file.cpp diff --git a/utils/encrypt_block.cpp b/aesxx/utils/encrypt_block.cpp index 0b87364..0b87364 100644 --- a/utils/encrypt_block.cpp +++ b/aesxx/utils/encrypt_block.cpp diff --git a/utils/encrypt_bmp.cpp b/aesxx/utils/encrypt_bmp.cpp index 7f1a890..7f1a890 100644 --- a/utils/encrypt_bmp.cpp +++ b/aesxx/utils/encrypt_bmp.cpp diff --git a/utils/encrypt_file.cpp b/aesxx/utils/encrypt_file.cpp index 570bc60..570bc60 100644 --- a/utils/encrypt_file.cpp +++ b/aesxx/utils/encrypt_file.cpp diff --git a/utils/file_cmd_parser.hpp b/aesxx/utils/file_cmd_parser.hpp index e199409..e199409 100644 --- a/utils/file_cmd_parser.hpp +++ b/aesxx/utils/file_cmd_parser.hpp diff --git a/utils/helpers/bmp.hpp b/aesxx/utils/helpers/bmp.hpp index b4b283b..b4b283b 100644 --- a/utils/helpers/bmp.hpp +++ b/aesxx/utils/helpers/bmp.hpp diff --git a/utils/helpers/command_line.hpp b/aesxx/utils/helpers/command_line.hpp index 2e4d803..2e4d803 100644 --- a/utils/helpers/command_line.hpp +++ b/aesxx/utils/helpers/command_line.hpp diff --git a/utils/helpers/file.hpp b/aesxx/utils/helpers/file.hpp index 48e4c51..48e4c51 100644 --- a/utils/helpers/file.hpp +++ b/aesxx/utils/helpers/file.hpp |