move executables from test/ to utils/

35 files changed, 2 insertions, 39 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
deleted file mode 100644
index 2d58160..0000000
--- a/test/CMakeLists.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-macro(test prefix)
-    add_executable(test_${prefix}_encrypt_block ${prefix}_encrypt_block.c)
-    target_link_libraries(test_${prefix}_encrypt_block libaesni)
-    set_target_properties(test_${prefix}_encrypt_block PROPERTIES OUTPUT_NAME ${prefix}_encrypt_block)
-
-    add_executable(test_${prefix}_decrypt_block ${prefix}_decrypt_block.c)
-    target_link_libraries(test_${prefix}_decrypt_block libaesni)
-    set_target_properties(test_${prefix}_decrypt_block PROPERTIES OUTPUT_NAME ${prefix}_decrypt_block)
-endmacro()
-
-test(aes128ecb)
-test(aes128cbc)
-test(aes128cfb)
-test(aes128ofb)
-test(aes128ctr)
-test(aes192ecb)
-test(aes192cbc)
-test(aes192cfb)
-test(aes192ofb)
-test(aes192ctr)
-test(aes256ecb)
-test(aes256cbc)
-test(aes256cfb)
-test(aes256ofb)
-test(aes256ctr)
-
-find_package(Boost REQUIRED COMPONENTS program_options)
-
-add_executable(test_aes_encrypt_block aes_encrypt_block.cpp aes_common.hpp)
-target_include_directories(test_aes_encrypt_block PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries(test_aes_encrypt_block libaesni libaesnixx ${Boost_LIBRARIES})
-set_target_properties(test_aes_encrypt_block PROPERTIES OUTPUT_NAME aes_encrypt_block)
-
-add_executable(test_aes_decrypt_block aes_decrypt_block.cpp aes_common.hpp)
-target_include_directories(test_aes_decrypt_block PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries(test_aes_decrypt_block libaesni libaesnixx ${Boost_LIBRARIES})
-set_target_properties(test_aes_decrypt_block PROPERTIES OUTPUT_NAME aes_decrypt_block)
diff --git a/test/README.md b/test/README.md
index e05b840..7b3b128 100644
--- a/test/README.md
+++ b/test/README.md
@@ -41,11 +41,11 @@ Use `--help` to see the script's usage details.
 
 To test the implementation against the vectors from [NIST SP 800-38A](http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf) using `nist-sp-800-32a.py`.
 
-    python nist-sp-800-38a.py -p C:\build\test\Debug
+    python nist-sp-800-38a.py -p C:\build\utils\block\cxx\Debug
 
 ### Cryptographic Algorithm Validation Program
 
 To test the implementation against the vectors from [CAVP](http://csrc.nist.gov/groups/STM/cavp/) using `cavp.py`.
 The AES Known Answer Test (KAT) Vectors are used and read from `KAT_AES.zip`.
 
-    python cavp.py -p C:\build\test\Debug
+    python cavp.py -p C:\build\utils\block\cxx\Debug
diff --git a/test/aes128cbc_decrypt_block.c b/utils/block/aes128cbc_decrypt_block.c
index 95120e7..95120e7 100644
--- a/test/aes128cbc_decrypt_block.c
+++ b/utils/block/aes128cbc_decrypt_block.c
diff --git a/test/aes128cbc_encrypt_block.c b/utils/block/aes128cbc_encrypt_block.c
index 68f95a3..68f95a3 100644
--- a/test/aes128cbc_encrypt_block.c
+++ b/utils/block/aes128cbc_encrypt_block.c
diff --git a/test/aes128cfb_decrypt_block.c b/utils/block/aes128cfb_decrypt_block.c
index ef68e44..ef68e44 100644
--- a/test/aes128cfb_decrypt_block.c
+++ b/utils/block/aes128cfb_decrypt_block.c
diff --git a/test/aes128cfb_encrypt_block.c b/utils/block/aes128cfb_encrypt_block.c
index 6f8fb4d..6f8fb4d 100644
--- a/test/aes128cfb_encrypt_block.c
+++ b/utils/block/aes128cfb_encrypt_block.c
diff --git a/test/aes128ctr_decrypt_block.c b/utils/block/aes128ctr_decrypt_block.c
index 85d07f5..85d07f5 100644
--- a/test/aes128ctr_decrypt_block.c
+++ b/utils/block/aes128ctr_decrypt_block.c
diff --git a/test/aes128ctr_encrypt_block.c b/utils/block/aes128ctr_encrypt_block.c
index a62f3cd..a62f3cd 100644
--- a/test/aes128ctr_encrypt_block.c
+++ b/utils/block/aes128ctr_encrypt_block.c
diff --git a/test/aes128ecb_decrypt_block.c b/utils/block/aes128ecb_decrypt_block.c
index 9fbf26d..9fbf26d 100644
--- a/test/aes128ecb_decrypt_block.c
+++ b/utils/block/aes128ecb_decrypt_block.c
diff --git a/test/aes128ecb_encrypt_block.c b/utils/block/aes128ecb_encrypt_block.c
index 45a1123..45a1123 100644
--- a/test/aes128ecb_encrypt_block.c
+++ b/utils/block/aes128ecb_encrypt_block.c
diff --git a/test/aes128ofb_decrypt_block.c b/utils/block/aes128ofb_decrypt_block.c
index e61e70f..e61e70f 100644
--- a/test/aes128ofb_decrypt_block.c
+++ b/utils/block/aes128ofb_decrypt_block.c
diff --git a/test/aes128ofb_encrypt_block.c b/utils/block/aes128ofb_encrypt_block.c
index 6613ca9..6613ca9 100644
--- a/test/aes128ofb_encrypt_block.c
+++ b/utils/block/aes128ofb_encrypt_block.c
diff --git a/test/aes192cbc_decrypt_block.c b/utils/block/aes192cbc_decrypt_block.c
index 13edbe4..13edbe4 100644
--- a/test/aes192cbc_decrypt_block.c
+++ b/utils/block/aes192cbc_decrypt_block.c
diff --git a/test/aes192cbc_encrypt_block.c b/utils/block/aes192cbc_encrypt_block.c
index d89c12d..d89c12d 100644
--- a/test/aes192cbc_encrypt_block.c
+++ b/utils/block/aes192cbc_encrypt_block.c
diff --git a/test/aes192cfb_decrypt_block.c b/utils/block/aes192cfb_decrypt_block.c
index cedc7d0..cedc7d0 100644
--- a/test/aes192cfb_decrypt_block.c
+++ b/utils/block/aes192cfb_decrypt_block.c
diff --git a/test/aes192cfb_encrypt_block.c b/utils/block/aes192cfb_encrypt_block.c
index 357df8d..357df8d 100644
--- a/test/aes192cfb_encrypt_block.c
+++ b/utils/block/aes192cfb_encrypt_block.c
diff --git a/test/aes192ctr_decrypt_block.c b/utils/block/aes192ctr_decrypt_block.c
index b094964..b094964 100644
--- a/test/aes192ctr_decrypt_block.c
+++ b/utils/block/aes192ctr_decrypt_block.c
diff --git a/test/aes192ctr_encrypt_block.c b/utils/block/aes192ctr_encrypt_block.c
index 977c7bf..977c7bf 100644
--- a/test/aes192ctr_encrypt_block.c
+++ b/utils/block/aes192ctr_encrypt_block.c
diff --git a/test/aes192ecb_decrypt_block.c b/utils/block/aes192ecb_decrypt_block.c
index 29e7274..29e7274 100644
--- a/test/aes192ecb_decrypt_block.c
+++ b/utils/block/aes192ecb_decrypt_block.c
diff --git a/test/aes192ecb_encrypt_block.c b/utils/block/aes192ecb_encrypt_block.c
index a74759c..a74759c 100644
--- a/test/aes192ecb_encrypt_block.c
+++ b/utils/block/aes192ecb_encrypt_block.c
diff --git a/test/aes192ofb_decrypt_block.c b/utils/block/aes192ofb_decrypt_block.c
index eaa9d2a..eaa9d2a 100644
--- a/test/aes192ofb_decrypt_block.c
+++ b/utils/block/aes192ofb_decrypt_block.c
diff --git a/test/aes192ofb_encrypt_block.c b/utils/block/aes192ofb_encrypt_block.c
index fed0c5a..fed0c5a 100644
--- a/test/aes192ofb_encrypt_block.c
+++ b/utils/block/aes192ofb_encrypt_block.c
diff --git a/test/aes256cbc_decrypt_block.c b/utils/block/aes256cbc_decrypt_block.c
index 0021007..0021007 100644
--- a/test/aes256cbc_decrypt_block.c
+++ b/utils/block/aes256cbc_decrypt_block.c
diff --git a/test/aes256cbc_encrypt_block.c b/utils/block/aes256cbc_encrypt_block.c
index e01ab95..e01ab95 100644
--- a/test/aes256cbc_encrypt_block.c
+++ b/utils/block/aes256cbc_encrypt_block.c
diff --git a/test/aes256cfb_decrypt_block.c b/utils/block/aes256cfb_decrypt_block.c
index 9d320a5..9d320a5 100644
--- a/test/aes256cfb_decrypt_block.c
+++ b/utils/block/aes256cfb_decrypt_block.c
diff --git a/test/aes256cfb_encrypt_block.c b/utils/block/aes256cfb_encrypt_block.c
index 94e8619..94e8619 100644
--- a/test/aes256cfb_encrypt_block.c
+++ b/utils/block/aes256cfb_encrypt_block.c
diff --git a/test/aes256ctr_decrypt_block.c b/utils/block/aes256ctr_decrypt_block.c
index a0f9ef0..a0f9ef0 100644
--- a/test/aes256ctr_decrypt_block.c
+++ b/utils/block/aes256ctr_decrypt_block.c
diff --git a/test/aes256ctr_encrypt_block.c b/utils/block/aes256ctr_encrypt_block.c
index fbae884..fbae884 100644
--- a/test/aes256ctr_encrypt_block.c
+++ b/utils/block/aes256ctr_encrypt_block.c
diff --git a/test/aes256ecb_decrypt_block.c b/utils/block/aes256ecb_decrypt_block.c
index 16ffe77..16ffe77 100644
--- a/test/aes256ecb_decrypt_block.c
+++ b/utils/block/aes256ecb_decrypt_block.c
diff --git a/test/aes256ecb_encrypt_block.c b/utils/block/aes256ecb_encrypt_block.c
index 01ae7ed..01ae7ed 100644
--- a/test/aes256ecb_encrypt_block.c
+++ b/utils/block/aes256ecb_encrypt_block.c
diff --git a/test/aes256ofb_decrypt_block.c b/utils/block/aes256ofb_decrypt_block.c
index a57c8db..a57c8db 100644
--- a/test/aes256ofb_decrypt_block.c
+++ b/utils/block/aes256ofb_decrypt_block.c
diff --git a/test/aes256ofb_encrypt_block.c b/utils/block/aes256ofb_encrypt_block.c
index 7dc01b8..7dc01b8 100644
--- a/test/aes256ofb_encrypt_block.c
+++ b/utils/block/aes256ofb_encrypt_block.c
diff --git a/test/aes_common.hpp b/utils/block/cxx/aes_common.hpp
index 78126e5..78126e5 100644
--- a/test/aes_common.hpp
+++ b/utils/block/cxx/aes_common.hpp
diff --git a/test/aes_decrypt_block.cpp b/utils/block/cxx/aes_decrypt_block.cpp
index 9898d4e..9898d4e 100644
--- a/test/aes_decrypt_block.cpp
+++ b/utils/block/cxx/aes_decrypt_block.cpp
diff --git a/test/aes_encrypt_block.cpp b/utils/block/cxx/aes_encrypt_block.cpp
index 9458831..9458831 100644
--- a/test/aes_encrypt_block.cpp
+++ b/utils/block/cxx/aes_encrypt_block.cpp