test: rename the utilities

32 files changed, 38 insertions, 38 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index a024d40..bfbb09c 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,13 +1,13 @@
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
 
 macro(test prefix)
-    add_executable(test_${prefix}_encrypt ${prefix}_encrypt.c)
-    target_link_libraries(test_${prefix}_encrypt libaesni)
-    set_target_properties(test_${prefix}_encrypt PROPERTIES OUTPUT_NAME ${prefix}_encrypt)
+    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 ${prefix}_decrypt.c)
-    target_link_libraries(test_${prefix}_decrypt libaesni)
-    set_target_properties(test_${prefix}_decrypt PROPERTIES OUTPUT_NAME ${prefix}_decrypt)
+    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)
diff --git a/test/aes128cbc_decrypt.c b/test/aes128cbc_decrypt_block.c
index f7ede57..3aacb83 100644
--- a/test/aes128cbc_decrypt.c
+++ b/test/aes128cbc_decrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes128cbc_decrypt.exe KEY0 IV0 [CIPHER0...] [-- KEY1 IV1 [CIPHER1...]...]");
+    puts("Usage: aes128cbc_decrypt_block.exe KEY0 IV0 [CIPHER0...] [-- KEY1 IV1 [CIPHER1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes128cbc_encrypt.c b/test/aes128cbc_encrypt_block.c
index d7bb57c..2d831ad 100644
--- a/test/aes128cbc_encrypt.c
+++ b/test/aes128cbc_encrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes128cbc_encrypt.exe KEY0 IV0 [PLAIN0...] [-- KEY1 IV1 [PLAIN1...]...]");
+    puts("Usage: aes128cbc_encrypt_block.exe KEY0 IV0 [PLAIN0...] [-- KEY1 IV1 [PLAIN1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes128cfb_decrypt.c b/test/aes128cfb_decrypt_block.c
index 8d53888..7bffd4f 100644
--- a/test/aes128cfb_decrypt.c
+++ b/test/aes128cfb_decrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes128cfb_decrypt.exe KEY0 IV0 [CIPHER0...] [-- KEY1 IV1 [CIPHER1...]...]");
+    puts("Usage: aes128cfb_decrypt_block.exe KEY0 IV0 [CIPHER0...] [-- KEY1 IV1 [CIPHER1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes128cfb_encrypt.c b/test/aes128cfb_encrypt_block.c
index 922788b..a991864 100644
--- a/test/aes128cfb_encrypt.c
+++ b/test/aes128cfb_encrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes128cfb_encrypt.exe KEY0 IV0 [PLAIN0...] [-- KEY1 IV1 [PLAIN1...]...]");
+    puts("Usage: aes128cfb_encrypt_block.exe KEY0 IV0 [PLAIN0...] [-- KEY1 IV1 [PLAIN1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes128ctr_decrypt.c b/test/aes128ctr_decrypt_block.c
index 2d4146c..e6f9cee 100644
--- a/test/aes128ctr_decrypt.c
+++ b/test/aes128ctr_decrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes128ctr_decrypt.exe KEY0 IV0 [CIPHER0...] [-- KEY1 IV1 [CIPHER1...]...]");
+    puts("Usage: aes128ctr_decrypt_block.exe KEY0 IV0 [CIPHER0...] [-- KEY1 IV1 [CIPHER1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes128ctr_encrypt.c b/test/aes128ctr_encrypt_block.c
index ef82029..6baa266 100644
--- a/test/aes128ctr_encrypt.c
+++ b/test/aes128ctr_encrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes128ctr_encrypt.exe KEY0 IV0 [PLAIN0...] [-- KEY1 IV1 [PLAIN1...]...]");
+    puts("Usage: aes128ctr_encrypt_block.exe KEY0 IV0 [PLAIN0...] [-- KEY1 IV1 [PLAIN1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes128ecb_decrypt.c b/test/aes128ecb_decrypt_block.c
index dc85928..54b890d 100644
--- a/test/aes128ecb_decrypt.c
+++ b/test/aes128ecb_decrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes128ecb_decrypt.exe KEY0 [CIPHER0...] [-- KEY1 [CIPHER1...]...]");
+    puts("Usage: aes128ecb_decrypt_block.exe KEY0 [CIPHER0...] [-- KEY1 [CIPHER1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes128ecb_encrypt.c b/test/aes128ecb_encrypt_block.c
index 3dc8fdb..43b1c1a 100644
--- a/test/aes128ecb_encrypt.c
+++ b/test/aes128ecb_encrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes128ecb_encrypt.exe KEY0 [PLAIN0...] [-- KEY1 [PLAIN1...]...]");
+    puts("Usage: aes128ecb_encrypt_block.exe KEY0 [PLAIN0...] [-- KEY1 [PLAIN1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes128ofb_decrypt.c b/test/aes128ofb_decrypt_block.c
index ff3ea93..edcbe77 100644
--- a/test/aes128ofb_decrypt.c
+++ b/test/aes128ofb_decrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes128ofb_decrypt.exe KEY0 IV0 [CIPHER0...] [-- KEY1 IV1 [CIPHER1...]...]");
+    puts("Usage: aes128ofb_decrypt_block.exe KEY0 IV0 [CIPHER0...] [-- KEY1 IV1 [CIPHER1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes128ofb_encrypt.c b/test/aes128ofb_encrypt_block.c
index 9b640da..d1ff412 100644
--- a/test/aes128ofb_encrypt.c
+++ b/test/aes128ofb_encrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes128ofb_encrypt.exe KEY0 IV0 [PLAIN0...] [-- KEY1 IV1 [PLAIN1...]...]");
+    puts("Usage: aes128ofb_encrypt_block.exe KEY0 IV0 [PLAIN0...] [-- KEY1 IV1 [PLAIN1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes192cbc_decrypt.c b/test/aes192cbc_decrypt_block.c
index d77a489..a714c2b 100644
--- a/test/aes192cbc_decrypt.c
+++ b/test/aes192cbc_decrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes192cbc_decrypt.exe KEY0 IV0 [CIPHER0...] [-- KEY1 IV1 [CIPHER1...]...]");
+    puts("Usage: aes192cbc_decrypt_block.exe KEY0 IV0 [CIPHER0...] [-- KEY1 IV1 [CIPHER1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes192cbc_encrypt.c b/test/aes192cbc_encrypt_block.c
index 33c242e..f0a23bc 100644
--- a/test/aes192cbc_encrypt.c
+++ b/test/aes192cbc_encrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes192cbc_encrypt.exe KEY0 IV0 [PLAIN0...] [-- KEY1 IV1 [PLAIN1...]...]");
+    puts("Usage: aes192cbc_encrypt_block.exe KEY0 IV0 [PLAIN0...] [-- KEY1 IV1 [PLAIN1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes192cfb_decrypt.c b/test/aes192cfb_decrypt_block.c
index aec2840..d8096a5 100644
--- a/test/aes192cfb_decrypt.c
+++ b/test/aes192cfb_decrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes192cfb_decrypt.exe KEY0 IV0 [CIPHER0...] [-- KEY1 IV1 [CIPHER1...]...]");
+    puts("Usage: aes192cfb_decrypt_block.exe KEY0 IV0 [CIPHER0...] [-- KEY1 IV1 [CIPHER1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes192cfb_encrypt.c b/test/aes192cfb_encrypt_block.c
index 1fba837..9ee207f 100644
--- a/test/aes192cfb_encrypt.c
+++ b/test/aes192cfb_encrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes192cfb_encrypt.exe KEY0 IV0 [PLAIN0...] [-- KEY1 IV1 [PLAIN1...]...]");
+    puts("Usage: aes192cfb_encrypt_block.exe KEY0 IV0 [PLAIN0...] [-- KEY1 IV1 [PLAIN1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes192ctr_decrypt.c b/test/aes192ctr_decrypt_block.c
index 9508b8d..0c818cf 100644
--- a/test/aes192ctr_decrypt.c
+++ b/test/aes192ctr_decrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes192ctr_decrypt.exe KEY0 IV0 [CIPHER0...] [-- KEY1 IV1 [CIPHER1...]...]");
+    puts("Usage: aes192ctr_decrypt_block.exe KEY0 IV0 [CIPHER0...] [-- KEY1 IV1 [CIPHER1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes192ctr_encrypt.c b/test/aes192ctr_encrypt_block.c
index 17eb1aa..1a494c3 100644
--- a/test/aes192ctr_encrypt.c
+++ b/test/aes192ctr_encrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes192ctr_encrypt.exe KEY0 IV0 [PLAIN0...] [-- KEY1 IV1 [PLAIN1...]...]");
+    puts("Usage: aes192ctr_encrypt_block.exe KEY0 IV0 [PLAIN0...] [-- KEY1 IV1 [PLAIN1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes192ecb_decrypt.c b/test/aes192ecb_decrypt_block.c
index 373a4a3..c034236 100644
--- a/test/aes192ecb_decrypt.c
+++ b/test/aes192ecb_decrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes192ecb_decrypt.exe KEY0 [CIPHER0...] [-- KEY1 [CIPHER1...]...]");
+    puts("Usage: aes192ecb_decrypt_block.exe KEY0 [CIPHER0...] [-- KEY1 [CIPHER1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes192ecb_encrypt.c b/test/aes192ecb_encrypt_block.c
index 16a0290..9af1e3e 100644
--- a/test/aes192ecb_encrypt.c
+++ b/test/aes192ecb_encrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes192ecb_encrypt.exe KEY0 [PLAIN0...] [-- KEY1 [PLAIN1...]...]");
+    puts("Usage: aes192ecb_encrypt_block.exe KEY0 [PLAIN0...] [-- KEY1 [PLAIN1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes192ofb_decrypt.c b/test/aes192ofb_decrypt_block.c
index 621031f..4044435 100644
--- a/test/aes192ofb_decrypt.c
+++ b/test/aes192ofb_decrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes192ofb_decrypt.exe KEY0 IV0 [CIPHER0...] [-- KEY1 IV1 [CIPHER1...]...]");
+    puts("Usage: aes192ofb_decrypt_block.exe KEY0 IV0 [CIPHER0...] [-- KEY1 IV1 [CIPHER1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes192ofb_encrypt.c b/test/aes192ofb_encrypt_block.c
index f7cb8d0..8d57208 100644
--- a/test/aes192ofb_encrypt.c
+++ b/test/aes192ofb_encrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes192ofb_encrypt.exe KEY0 IV0 [PLAIN0...] [-- KEY1 IV1 [PLAIN1...]...]");
+    puts("Usage: aes192ofb_encrypt_block.exe KEY0 IV0 [PLAIN0...] [-- KEY1 IV1 [PLAIN1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes256cbc_decrypt.c b/test/aes256cbc_decrypt_block.c
index bab00ab..7a1defe 100644
--- a/test/aes256cbc_decrypt.c
+++ b/test/aes256cbc_decrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes256cbc_decrypt.exe KEY0 IV0 [CIPHER0...] [-- KEY1 IV1 [CIPHER1...]...]");
+    puts("Usage: aes256cbc_decrypt_block.exe KEY0 IV0 [CIPHER0...] [-- KEY1 IV1 [CIPHER1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes256cbc_encrypt.c b/test/aes256cbc_encrypt_block.c
index 51a80f3..81ffcc8 100644
--- a/test/aes256cbc_encrypt.c
+++ b/test/aes256cbc_encrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes256cbc_encrypt.exe KEY0 IV0 [PLAIN0...] [-- KEY1 IV1 [PLAIN1...]...]");
+    puts("Usage: aes256cbc_encrypt_block.exe KEY0 IV0 [PLAIN0...] [-- KEY1 IV1 [PLAIN1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes256cfb_decrypt.c b/test/aes256cfb_decrypt_block.c
index c192178..ffa352a 100644
--- a/test/aes256cfb_decrypt.c
+++ b/test/aes256cfb_decrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes256cfb_decrypt.exe KEY0 IV0 [CIPHER0...] [-- KEY1 IV1 [CIPHER1...]...]");
+    puts("Usage: aes256cfb_decrypt_block.exe KEY0 IV0 [CIPHER0...] [-- KEY1 IV1 [CIPHER1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes256cfb_encrypt.c b/test/aes256cfb_encrypt_block.c
index 96f59c5..5afb7ab 100644
--- a/test/aes256cfb_encrypt.c
+++ b/test/aes256cfb_encrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes256cfb_encrypt.exe KEY0 IV0 [PLAIN0...] [-- KEY1 IV1 [PLAIN1...]...]");
+    puts("Usage: aes256cfb_encrypt_block.exe KEY0 IV0 [PLAIN0...] [-- KEY1 IV1 [PLAIN1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes256ctr_decrypt.c b/test/aes256ctr_decrypt_block.c
index d832a1f..79d60e4 100644
--- a/test/aes256ctr_decrypt.c
+++ b/test/aes256ctr_decrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes256ctr_decrypt.exe KEY0 IV0 [CIPHER0...] [-- KEY1 IV1 [CIPHER1...]...]");
+    puts("Usage: aes256ctr_decrypt_block.exe KEY0 IV0 [CIPHER0...] [-- KEY1 IV1 [CIPHER1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes256ctr_encrypt.c b/test/aes256ctr_encrypt_block.c
index 28857ac..3b384dc 100644
--- a/test/aes256ctr_encrypt.c
+++ b/test/aes256ctr_encrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes256ctr_encrypt.exe KEY0 IV0 [PLAIN0...] [-- KEY1 IV1 [PLAIN1...]...]");
+    puts("Usage: aes256ctr_encrypt_block.exe KEY0 IV0 [PLAIN0...] [-- KEY1 IV1 [PLAIN1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes256ecb_decrypt.c b/test/aes256ecb_decrypt_block.c
index eed5528..106aa8b 100644
--- a/test/aes256ecb_decrypt.c
+++ b/test/aes256ecb_decrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes256ecb_decrypt.exe KEY0 [CIPHER0...] [-- KEY1 [CIPHER1...]...]");
+    puts("Usage: aes256ecb_decrypt_block.exe KEY0 [CIPHER0...] [-- KEY1 [CIPHER1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes256ecb_encrypt.c b/test/aes256ecb_encrypt_block.c
index cfcc74e..4f550b6 100644
--- a/test/aes256ecb_encrypt.c
+++ b/test/aes256ecb_encrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes256ecb_encrypt.exe KEY0 [PLAIN0...] [-- KEY1 [PLAIN1...]...]");
+    puts("Usage: aes256ecb_encrypt_block.exe KEY0 [PLAIN0...] [-- KEY1 [PLAIN1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes256ofb_decrypt.c b/test/aes256ofb_decrypt_block.c
index 8c324e9..7b4c614 100644
--- a/test/aes256ofb_decrypt.c
+++ b/test/aes256ofb_decrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes256ofb_decrypt.exe KEY0 IV0 [CIPHER0...] [-- KEY1 IV1 [CIPHER1...]...]");
+    puts("Usage: aes256ofb_decrypt_block.exe KEY0 IV0 [CIPHER0...] [-- KEY1 IV1 [CIPHER1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/aes256ofb_encrypt.c b/test/aes256ofb_encrypt_block.c
index 8d31fbe..09d2edb 100644
--- a/test/aes256ofb_encrypt.c
+++ b/test/aes256ofb_encrypt_block.c
@@ -14,7 +14,7 @@
 
 static void exit_with_usage()
 {
-    puts("Usage: aes256ofb_encrypt.exe KEY0 IV0 [PLAIN0...] [-- KEY1 IV1 [PLAIN1...]...]");
+    puts("Usage: aes256ofb_encrypt_block.exe KEY0 IV0 [PLAIN0...] [-- KEY1 IV1 [PLAIN1...]...]");
     exit(EXIT_FAILURE);
 }
 
diff --git a/test/toolkit.py b/test/toolkit.py
index fdbd51e..75a0b1f 100644
--- a/test/toolkit.py
+++ b/test/toolkit.py
@@ -76,10 +76,10 @@ class Tools:
         return os.path.join(self._root_dir_path, fn)
 
     def get_encrypt_tool_path(self, algo, mode):
-        return self._get_tool_path('{0}{1}_encrypt.exe'.format(algo, mode))
+        return self._get_tool_path('{0}{1}_encrypt_block.exe'.format(algo, mode))
 
     def get_decrypt_tool_path(self, algo, mode):
-        return self._get_tool_path('{0}{1}_decrypt.exe'.format(algo, mode))
+        return self._get_tool_path('{0}{1}_decrypt_block.exe'.format(algo, mode))
 
     def run_tool(self, tool_path, args):
         cmd_list = ['sde', '--', tool_path] if self._use_sde else [tool_path]