move executables from test/ to utils/

50 files changed, 2731 insertions, 32 deletions

diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index d13bdeb..ce18593 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -1,30 +1,2 @@
-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)
-
-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)
+add_subdirectory(block)
+add_subdirectory(file)
diff --git a/utils/block/CMakeLists.txt b/utils/block/CMakeLists.txt
new file mode 100644
index 0000000..4b232bd
--- /dev/null
+++ b/utils/block/CMakeLists.txt
@@ -0,0 +1,27 @@
+macro(util prefix)
+    add_executable(util_${prefix}_encrypt_block ${prefix}_encrypt_block.c)
+    target_link_libraries(util_${prefix}_encrypt_block libaesni)
+    set_target_properties(util_${prefix}_encrypt_block PROPERTIES OUTPUT_NAME ${prefix}_encrypt_block)
+
+    add_executable(util_${prefix}_decrypt_block ${prefix}_decrypt_block.c)
+    target_link_libraries(util_${prefix}_decrypt_block libaesni)
+    set_target_properties(util_${prefix}_decrypt_block PROPERTIES OUTPUT_NAME ${prefix}_decrypt_block)
+endmacro()
+
+util(aes128ecb)
+util(aes128cbc)
+util(aes128cfb)
+util(aes128ofb)
+util(aes128ctr)
+util(aes192ecb)
+util(aes192cbc)
+util(aes192cfb)
+util(aes192ofb)
+util(aes192ctr)
+util(aes256ecb)
+util(aes256cbc)
+util(aes256cfb)
+util(aes256ofb)
+util(aes256ctr)
+
+add_subdirectory(cxx)
diff --git a/utils/block/aes128cbc_decrypt_block.c b/utils/block/aes128cbc_decrypt_block.c
new file mode 100644
index 0000000..95120e7
--- /dev/null
+++ b/utils/block/aes128cbc_decrypt_block.c
@@ -0,0 +1,76 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes128cbc_decrypt_block.exe KEY0 IV0 [CIPHERTEXT0...] [-- KEY1 IV1 [CIPHERTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext, iv;
+        AesNI_Aes128_Key key;
+        AesNI_Aes128_RoundKeys encryption_keys, decryption_keys;
+
+        if (argc < 2)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes128_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        if (aesni_is_error(status = aesni_aes_parse_block(&iv, argv[1], NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes128_expand_key(&key, &encryption_keys);
+        aesni_aes128_derive_decryption_keys(&encryption_keys, &decryption_keys);
+
+        for (argc -= 2, argv += 2; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&ciphertext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            plaintext = aesni_aes128_decrypt_block_cbc(ciphertext, &decryption_keys, iv, &iv);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&plaintext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes128cbc_encrypt_block.c b/utils/block/aes128cbc_encrypt_block.c
new file mode 100644
index 0000000..68f95a3
--- /dev/null
+++ b/utils/block/aes128cbc_encrypt_block.c
@@ -0,0 +1,75 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes128cbc_encrypt_block.exe KEY0 IV0 [PLAINTEXT0...] [-- KEY1 IV1 [PLAINTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext, iv;
+        AesNI_Aes128_Key key;
+        AesNI_Aes128_RoundKeys encryption_keys;
+
+        if (argc < 2)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes128_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        if (aesni_is_error(status = aesni_aes_parse_block(&iv, argv[1], NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes128_expand_key(&key, &encryption_keys);
+
+        for (argc -= 2, argv += 2; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&plaintext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            ciphertext = aesni_aes128_encrypt_block_cbc(plaintext, &encryption_keys, iv, &iv);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&ciphertext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes128cfb_decrypt_block.c b/utils/block/aes128cfb_decrypt_block.c
new file mode 100644
index 0000000..ef68e44
--- /dev/null
+++ b/utils/block/aes128cfb_decrypt_block.c
@@ -0,0 +1,75 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes128cfb_decrypt_block.exe KEY0 IV0 [CIPHERTEXT0...] [-- KEY1 IV1 [CIPHERTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext, iv;
+        AesNI_Aes128_Key key;
+        AesNI_Aes128_RoundKeys encryption_keys;
+
+        if (argc < 2)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes128_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        if (aesni_is_error(status = aesni_aes_parse_block(&iv, argv[1], NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes128_expand_key(&key, &encryption_keys);
+
+        for (argc -= 2, argv += 2; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&ciphertext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            plaintext = aesni_aes128_decrypt_block_cfb(ciphertext, &encryption_keys, iv, &iv);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&plaintext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes128cfb_encrypt_block.c b/utils/block/aes128cfb_encrypt_block.c
new file mode 100644
index 0000000..6f8fb4d
--- /dev/null
+++ b/utils/block/aes128cfb_encrypt_block.c
@@ -0,0 +1,75 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes128cfb_encrypt_block.exe KEY0 IV0 [PLAINTEXT0...] [-- KEY1 IV1 [PLAINTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext, iv;
+        AesNI_Aes128_Key key;
+        AesNI_Aes128_RoundKeys encryption_keys;
+
+        if (argc < 2)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes128_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        if (aesni_is_error(status = aesni_aes_parse_block(&iv, argv[1], NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes128_expand_key(&key, &encryption_keys);
+
+        for (argc -= 2, argv += 2; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&plaintext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            ciphertext = aesni_aes128_encrypt_block_cfb(plaintext, &encryption_keys, iv, &iv);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&ciphertext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes128ctr_decrypt_block.c b/utils/block/aes128ctr_decrypt_block.c
new file mode 100644
index 0000000..85d07f5
--- /dev/null
+++ b/utils/block/aes128ctr_decrypt_block.c
@@ -0,0 +1,75 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes128ctr_decrypt_block.exe KEY0 IV0 [CIPHERTEXT0...] [-- KEY1 IV1 [CIPHERTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext, iv;
+        AesNI_Aes128_Key key;
+        AesNI_Aes128_RoundKeys encryption_keys;
+
+        if (argc < 2)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes128_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        if (aesni_is_error(status = aesni_aes_parse_block(&iv, argv[1], NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes128_expand_key(&key, &encryption_keys);
+
+        for (argc -= 2, argv += 2; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&ciphertext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            plaintext = aesni_aes128_decrypt_block_ctr(ciphertext, &encryption_keys, iv, &iv);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&plaintext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes128ctr_encrypt_block.c b/utils/block/aes128ctr_encrypt_block.c
new file mode 100644
index 0000000..a62f3cd
--- /dev/null
+++ b/utils/block/aes128ctr_encrypt_block.c
@@ -0,0 +1,75 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes128ctr_encrypt_block.exe KEY0 IV0 [PLAINTEXT0...] [-- KEY1 IV1 [PLAINTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext, iv;
+        AesNI_Aes128_Key key;
+        AesNI_Aes128_RoundKeys encryption_keys;
+
+        if (argc < 2)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes128_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        if (aesni_is_error(status = aesni_aes_parse_block(&iv, argv[1], NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes128_expand_key(&key, &encryption_keys);
+
+        for (argc -= 2, argv += 2; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&plaintext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            ciphertext = aesni_aes128_encrypt_block_ctr(plaintext, &encryption_keys, iv, &iv);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&ciphertext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes128ecb_decrypt_block.c b/utils/block/aes128ecb_decrypt_block.c
new file mode 100644
index 0000000..9fbf26d
--- /dev/null
+++ b/utils/block/aes128ecb_decrypt_block.c
@@ -0,0 +1,70 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes128ecb_decrypt_block.exe KEY0 [CIPHERTEXT0...] [-- KEY1 [CIPHERTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext;
+        AesNI_Aes128_Key key;
+        AesNI_Aes128_RoundKeys encryption_keys, decryption_keys;
+
+        if (argc < 1)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes128_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes128_expand_key(&key, &encryption_keys);
+        aesni_aes128_derive_decryption_keys(&encryption_keys, &decryption_keys);
+
+        for (--argc, ++argv; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&ciphertext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            plaintext = aesni_aes128_decrypt_block_ecb(ciphertext, &decryption_keys);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&plaintext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes128ecb_encrypt_block.c b/utils/block/aes128ecb_encrypt_block.c
new file mode 100644
index 0000000..45a1123
--- /dev/null
+++ b/utils/block/aes128ecb_encrypt_block.c
@@ -0,0 +1,69 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes128ecb_encrypt_block.exe KEY0 [PLAINTEXT0...] [-- KEY1 [PLAINTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext;
+        AesNI_Aes128_Key key;
+        AesNI_Aes128_RoundKeys encryption_keys;
+
+        if (argc < 1)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes128_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes128_expand_key(&key, &encryption_keys);
+
+        for (--argc, ++argv; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&plaintext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            ciphertext = aesni_aes128_encrypt_block_ecb(plaintext, &encryption_keys);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&ciphertext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes128ofb_decrypt_block.c b/utils/block/aes128ofb_decrypt_block.c
new file mode 100644
index 0000000..e61e70f
--- /dev/null
+++ b/utils/block/aes128ofb_decrypt_block.c
@@ -0,0 +1,75 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes128ofb_decrypt_block.exe KEY0 IV0 [CIPHERTEXT0...] [-- KEY1 IV1 [CIPHERTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext, iv;
+        AesNI_Aes128_Key key;
+        AesNI_Aes128_RoundKeys encryption_keys;
+
+        if (argc < 2)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes128_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        if (aesni_is_error(status = aesni_aes_parse_block(&iv, argv[1], NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes128_expand_key(&key, &encryption_keys);
+
+        for (argc -= 2, argv += 2; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&ciphertext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            plaintext = aesni_aes128_decrypt_block_ofb(ciphertext, &encryption_keys, iv, &iv);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&plaintext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes128ofb_encrypt_block.c b/utils/block/aes128ofb_encrypt_block.c
new file mode 100644
index 0000000..6613ca9
--- /dev/null
+++ b/utils/block/aes128ofb_encrypt_block.c
@@ -0,0 +1,75 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes128ofb_encrypt_block.exe KEY0 IV0 [PLAINTEXT0...] [-- KEY1 IV1 [PLAINTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext, iv;
+        AesNI_Aes128_Key key;
+        AesNI_Aes128_RoundKeys encryption_keys;
+
+        if (argc < 2)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes128_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        if (aesni_is_error(status = aesni_aes_parse_block(&iv, argv[1], NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes128_expand_key(&key, &encryption_keys);
+
+        for (argc -= 2, argv += 2; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&plaintext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            ciphertext = aesni_aes128_encrypt_block_ofb(plaintext, &encryption_keys, iv, &iv);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&ciphertext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes192cbc_decrypt_block.c b/utils/block/aes192cbc_decrypt_block.c
new file mode 100644
index 0000000..13edbe4
--- /dev/null
+++ b/utils/block/aes192cbc_decrypt_block.c
@@ -0,0 +1,76 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes192cbc_decrypt_block.exe KEY0 IV0 [CIPHERTEXT0...] [-- KEY1 IV1 [CIPHERTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext, iv;
+        AesNI_Aes192_Key key;
+        AesNI_Aes192_RoundKeys encryption_keys, decryption_keys;
+
+        if (argc < 2)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes192_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        if (aesni_is_error(status = aesni_aes_parse_block(&iv, argv[1], NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes192_expand_key(&key, &encryption_keys);
+        aesni_aes192_derive_decryption_keys(&encryption_keys, &decryption_keys);
+
+        for (argc -= 2, argv += 2; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&ciphertext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            plaintext = aesni_aes192_decrypt_block_cbc(ciphertext, &decryption_keys, iv, &iv);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&plaintext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes192cbc_encrypt_block.c b/utils/block/aes192cbc_encrypt_block.c
new file mode 100644
index 0000000..d89c12d
--- /dev/null
+++ b/utils/block/aes192cbc_encrypt_block.c
@@ -0,0 +1,75 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes192cbc_encrypt_block.exe KEY0 IV0 [PLAINTEXT0...] [-- KEY1 IV1 [PLAINTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext, iv;
+        AesNI_Aes192_Key key;
+        AesNI_Aes192_RoundKeys encryption_keys;
+
+        if (argc < 2)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes192_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        if (aesni_is_error(status = aesni_aes_parse_block(&iv, argv[1], NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes192_expand_key(&key, &encryption_keys);
+
+        for (argc -= 2, argv += 2; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&plaintext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            ciphertext = aesni_aes192_encrypt_block_cbc(plaintext, &encryption_keys, iv, &iv);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&ciphertext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes192cfb_decrypt_block.c b/utils/block/aes192cfb_decrypt_block.c
new file mode 100644
index 0000000..cedc7d0
--- /dev/null
+++ b/utils/block/aes192cfb_decrypt_block.c
@@ -0,0 +1,75 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes192cfb_decrypt_block.exe KEY0 IV0 [CIPHERTEXT0...] [-- KEY1 IV1 [CIPHERTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext, iv;
+        AesNI_Aes192_Key key;
+        AesNI_Aes192_RoundKeys encryption_keys;
+
+        if (argc < 2)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes192_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        if (aesni_is_error(status = aesni_aes_parse_block(&iv, argv[1], NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes192_expand_key(&key, &encryption_keys);
+
+        for (argc -= 2, argv += 2; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&ciphertext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            plaintext = aesni_aes192_decrypt_block_cfb(ciphertext, &encryption_keys, iv, &iv);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&plaintext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes192cfb_encrypt_block.c b/utils/block/aes192cfb_encrypt_block.c
new file mode 100644
index 0000000..357df8d
--- /dev/null
+++ b/utils/block/aes192cfb_encrypt_block.c
@@ -0,0 +1,75 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes192cfb_encrypt_block.exe KEY0 IV0 [PLAINTEXT0...] [-- KEY1 IV1 [PLAINTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext, iv;
+        AesNI_Aes192_Key key;
+        AesNI_Aes192_RoundKeys encryption_keys;
+
+        if (argc < 2)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes192_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        if (aesni_is_error(status = aesni_aes_parse_block(&iv, argv[1], NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes192_expand_key(&key, &encryption_keys);
+
+        for (argc -= 2, argv += 2; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&plaintext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            ciphertext = aesni_aes192_encrypt_block_cfb(plaintext, &encryption_keys, iv, &iv);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&ciphertext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes192ctr_decrypt_block.c b/utils/block/aes192ctr_decrypt_block.c
new file mode 100644
index 0000000..b094964
--- /dev/null
+++ b/utils/block/aes192ctr_decrypt_block.c
@@ -0,0 +1,75 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes192ctr_decrypt_block.exe KEY0 IV0 [CIPHERTEXT0...] [-- KEY1 IV1 [CIPHERTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext, iv;
+        AesNI_Aes192_Key key;
+        AesNI_Aes192_RoundKeys encryption_keys;
+
+        if (argc < 2)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes192_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        if (aesni_is_error(status = aesni_aes_parse_block(&iv, argv[1], NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes192_expand_key(&key, &encryption_keys);
+
+        for (argc -= 2, argv += 2; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&ciphertext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            plaintext = aesni_aes192_decrypt_block_ctr(ciphertext, &encryption_keys, iv, &iv);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&plaintext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes192ctr_encrypt_block.c b/utils/block/aes192ctr_encrypt_block.c
new file mode 100644
index 0000000..977c7bf
--- /dev/null
+++ b/utils/block/aes192ctr_encrypt_block.c
@@ -0,0 +1,75 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes192ctr_encrypt_block.exe KEY0 IV0 [PLAINTEXT0...] [-- KEY1 IV1 [PLAINTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext, iv;
+        AesNI_Aes192_Key key;
+        AesNI_Aes192_RoundKeys encryption_keys;
+
+        if (argc < 2)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes192_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        if (aesni_is_error(status = aesni_aes_parse_block(&iv, argv[1], NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes192_expand_key(&key, &encryption_keys);
+
+        for (argc -= 2, argv += 2; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&plaintext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            ciphertext = aesni_aes192_encrypt_block_ctr(plaintext, &encryption_keys, iv, &iv);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&ciphertext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes192ecb_decrypt_block.c b/utils/block/aes192ecb_decrypt_block.c
new file mode 100644
index 0000000..29e7274
--- /dev/null
+++ b/utils/block/aes192ecb_decrypt_block.c
@@ -0,0 +1,70 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes192ecb_decrypt_block.exe KEY0 [CIPHERTEXT0...] [-- KEY1 [CIPHERTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext;
+        AesNI_Aes192_Key key;
+        AesNI_Aes192_RoundKeys encryption_keys, decryption_keys;
+
+        if (argc < 1)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes192_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes192_expand_key(&key, &encryption_keys);
+        aesni_aes192_derive_decryption_keys(&encryption_keys, &decryption_keys);
+
+        for (--argc, ++argv; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&ciphertext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            plaintext = aesni_aes192_decrypt_block_ecb(ciphertext, &decryption_keys);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&plaintext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes192ecb_encrypt_block.c b/utils/block/aes192ecb_encrypt_block.c
new file mode 100644
index 0000000..a74759c
--- /dev/null
+++ b/utils/block/aes192ecb_encrypt_block.c
@@ -0,0 +1,69 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes192ecb_encrypt_block.exe KEY0 [PLAINTEXT0...] [-- KEY1 [PLAINTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext;
+        AesNI_Aes192_Key key;
+        AesNI_Aes192_RoundKeys encryption_keys;
+
+        if (argc < 1)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes192_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes192_expand_key(&key, &encryption_keys);
+
+        for (--argc, ++argv; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&plaintext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            ciphertext = aesni_aes192_encrypt_block_ecb(plaintext, &encryption_keys);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&ciphertext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes192ofb_decrypt_block.c b/utils/block/aes192ofb_decrypt_block.c
new file mode 100644
index 0000000..eaa9d2a
--- /dev/null
+++ b/utils/block/aes192ofb_decrypt_block.c
@@ -0,0 +1,75 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes192ofb_decrypt_block.exe KEY0 IV0 [CIPHERTEXT0...] [-- KEY1 IV1 [CIPHERTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext, iv;
+        AesNI_Aes192_Key key;
+        AesNI_Aes192_RoundKeys encryption_keys;
+
+        if (argc < 2)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes192_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        if (aesni_is_error(status = aesni_aes_parse_block(&iv, argv[1], NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes192_expand_key(&key, &encryption_keys);
+
+        for (argc -= 2, argv += 2; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&ciphertext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            plaintext = aesni_aes192_decrypt_block_ofb(ciphertext, &encryption_keys, iv, &iv);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&plaintext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes192ofb_encrypt_block.c b/utils/block/aes192ofb_encrypt_block.c
new file mode 100644
index 0000000..fed0c5a
--- /dev/null
+++ b/utils/block/aes192ofb_encrypt_block.c
@@ -0,0 +1,75 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes192ofb_encrypt_block.exe KEY0 IV0 [PLAINTEXT0...] [-- KEY1 IV1 [PLAINTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext, iv;
+        AesNI_Aes192_Key key;
+        AesNI_Aes192_RoundKeys encryption_keys;
+
+        if (argc < 2)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes192_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        if (aesni_is_error(status = aesni_aes_parse_block(&iv, argv[1], NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes192_expand_key(&key, &encryption_keys);
+
+        for (argc -= 2, argv += 2; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&plaintext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            ciphertext = aesni_aes192_encrypt_block_ofb(plaintext, &encryption_keys, iv, &iv);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&ciphertext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes256cbc_decrypt_block.c b/utils/block/aes256cbc_decrypt_block.c
new file mode 100644
index 0000000..0021007
--- /dev/null
+++ b/utils/block/aes256cbc_decrypt_block.c
@@ -0,0 +1,76 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes256cbc_decrypt_block.exe KEY0 IV0 [CIPHERTEXT0...] [-- KEY1 IV1 [CIPHERTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext, iv;
+        AesNI_Aes256_Key key;
+        AesNI_Aes256_RoundKeys encryption_keys, decryption_keys;
+
+        if (argc < 2)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes256_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        if (aesni_is_error(status = aesni_aes_parse_block(&iv, argv[1], NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes256_expand_key(&key, &encryption_keys);
+        aesni_aes256_derive_decryption_keys(&encryption_keys, &decryption_keys);
+
+        for (argc -= 2, argv += 2; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&ciphertext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            plaintext = aesni_aes256_decrypt_block_cbc(ciphertext, &decryption_keys, iv, &iv);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&plaintext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes256cbc_encrypt_block.c b/utils/block/aes256cbc_encrypt_block.c
new file mode 100644
index 0000000..e01ab95
--- /dev/null
+++ b/utils/block/aes256cbc_encrypt_block.c
@@ -0,0 +1,75 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes256cbc_encrypt_block.exe KEY0 IV0 [PLAINTEXT0...] [-- KEY1 IV1 [PLAINTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext, iv;
+        AesNI_Aes256_Key key;
+        AesNI_Aes256_RoundKeys encryption_keys;
+
+        if (argc < 2)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes256_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        if (aesni_is_error(status = aesni_aes_parse_block(&iv, argv[1], NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes256_expand_key(&key, &encryption_keys);
+
+        for (argc -= 2, argv += 2; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&plaintext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            ciphertext = aesni_aes256_encrypt_block_cbc(plaintext, &encryption_keys, iv, &iv);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&ciphertext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes256cfb_decrypt_block.c b/utils/block/aes256cfb_decrypt_block.c
new file mode 100644
index 0000000..9d320a5
--- /dev/null
+++ b/utils/block/aes256cfb_decrypt_block.c
@@ -0,0 +1,75 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes256cfb_decrypt_block.exe KEY0 IV0 [CIPHERTEXT0...] [-- KEY1 IV1 [CIPHERTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext, iv;
+        AesNI_Aes256_Key key;
+        AesNI_Aes256_RoundKeys encryption_keys;
+
+        if (argc < 2)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes256_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        if (aesni_is_error(status = aesni_aes_parse_block(&iv, argv[1], NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes256_expand_key(&key, &encryption_keys);
+
+        for (argc -= 2, argv += 2; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&ciphertext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            plaintext = aesni_aes256_decrypt_block_cfb(ciphertext, &encryption_keys, iv, &iv);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&plaintext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes256cfb_encrypt_block.c b/utils/block/aes256cfb_encrypt_block.c
new file mode 100644
index 0000000..94e8619
--- /dev/null
+++ b/utils/block/aes256cfb_encrypt_block.c
@@ -0,0 +1,75 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes256cfb_encrypt_block.exe KEY0 IV0 [PLAINTEXT0...] [-- KEY1 IV1 [PLAINTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext, iv;
+        AesNI_Aes256_Key key;
+        AesNI_Aes256_RoundKeys encryption_keys;
+
+        if (argc < 2)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes256_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        if (aesni_is_error(status = aesni_aes_parse_block(&iv, argv[1], NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes256_expand_key(&key, &encryption_keys);
+
+        for (argc -= 2, argv += 2; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&plaintext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            ciphertext = aesni_aes256_encrypt_block_cfb(plaintext, &encryption_keys, iv, &iv);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&ciphertext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes256ctr_decrypt_block.c b/utils/block/aes256ctr_decrypt_block.c
new file mode 100644
index 0000000..a0f9ef0
--- /dev/null
+++ b/utils/block/aes256ctr_decrypt_block.c
@@ -0,0 +1,75 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes256ctr_decrypt_block.exe KEY0 IV0 [CIPHERTEXT0...] [-- KEY1 IV1 [CIPHERTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext, iv;
+        AesNI_Aes256_Key key;
+        AesNI_Aes256_RoundKeys encryption_keys;
+
+        if (argc < 2)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes256_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        if (aesni_is_error(status = aesni_aes_parse_block(&iv, argv[1], NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes256_expand_key(&key, &encryption_keys);
+
+        for (argc -= 2, argv += 2; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&ciphertext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            plaintext = aesni_aes256_decrypt_block_ctr(ciphertext, &encryption_keys, iv, &iv);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&plaintext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes256ctr_encrypt_block.c b/utils/block/aes256ctr_encrypt_block.c
new file mode 100644
index 0000000..fbae884
--- /dev/null
+++ b/utils/block/aes256ctr_encrypt_block.c
@@ -0,0 +1,75 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes256ctr_encrypt_block.exe KEY0 IV0 [PLAINTEXT0...] [-- KEY1 IV1 [PLAINTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext, iv;
+        AesNI_Aes256_Key key;
+        AesNI_Aes256_RoundKeys encryption_keys;
+
+        if (argc < 2)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes256_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        if (aesni_is_error(status = aesni_aes_parse_block(&iv, argv[1], NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes256_expand_key(&key, &encryption_keys);
+
+        for (argc -= 2, argv += 2; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&plaintext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            ciphertext = aesni_aes256_encrypt_block_ctr(plaintext, &encryption_keys, iv, &iv);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&ciphertext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes256ecb_decrypt_block.c b/utils/block/aes256ecb_decrypt_block.c
new file mode 100644
index 0000000..16ffe77
--- /dev/null
+++ b/utils/block/aes256ecb_decrypt_block.c
@@ -0,0 +1,70 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes256ecb_decrypt_block.exe KEY0 [CIPHERTEXT0...] [-- KEY1 [CIPHERTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext;
+        AesNI_Aes256_Key key;
+        AesNI_Aes256_RoundKeys encryption_keys, decryption_keys;
+
+        if (argc < 1)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes256_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes256_expand_key(&key, &encryption_keys);
+        aesni_aes256_derive_decryption_keys(&encryption_keys, &decryption_keys);
+
+        for (--argc, ++argv; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&ciphertext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            plaintext = aesni_aes256_decrypt_block_ecb(ciphertext, &decryption_keys);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&plaintext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes256ecb_encrypt_block.c b/utils/block/aes256ecb_encrypt_block.c
new file mode 100644
index 0000000..01ae7ed
--- /dev/null
+++ b/utils/block/aes256ecb_encrypt_block.c
@@ -0,0 +1,69 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes256ecb_encrypt_block.exe KEY0 [PLAINTEXT0...] [-- KEY1 [PLAINTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext;
+        AesNI_Aes256_Key key;
+        AesNI_Aes256_RoundKeys encryption_keys;
+
+        if (argc < 1)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes256_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes256_expand_key(&key, &encryption_keys);
+
+        for (--argc, ++argv; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&plaintext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            ciphertext = aesni_aes256_encrypt_block_ecb(plaintext, &encryption_keys);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&ciphertext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes256ofb_decrypt_block.c b/utils/block/aes256ofb_decrypt_block.c
new file mode 100644
index 0000000..a57c8db
--- /dev/null
+++ b/utils/block/aes256ofb_decrypt_block.c
@@ -0,0 +1,75 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes256ofb_decrypt_block.exe KEY0 IV0 [CIPHERTEXT0...] [-- KEY1 IV1 [CIPHERTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext, iv;
+        AesNI_Aes256_Key key;
+        AesNI_Aes256_RoundKeys encryption_keys;
+
+        if (argc < 2)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes256_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        if (aesni_is_error(status = aesni_aes_parse_block(&iv, argv[1], NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes256_expand_key(&key, &encryption_keys);
+
+        for (argc -= 2, argv += 2; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&ciphertext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            plaintext = aesni_aes256_decrypt_block_ofb(ciphertext, &encryption_keys, iv, &iv);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&plaintext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/aes256ofb_encrypt_block.c b/utils/block/aes256ofb_encrypt_block.c
new file mode 100644
index 0000000..7dc01b8
--- /dev/null
+++ b/utils/block/aes256ofb_encrypt_block.c
@@ -0,0 +1,75 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include <aesni/all.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void exit_with_usage()
+{
+    puts("Usage: aes256ofb_encrypt_block.exe KEY0 IV0 [PLAINTEXT0...] [-- KEY1 IV1 [PLAINTEXT1...]...]");
+    exit(EXIT_FAILURE);
+}
+
+static void print_error(AesNI_StatusCode status)
+{
+    fprintf(stderr, "AesNI error: %s\n", aesni_strerror(status));
+}
+
+int main(int argc, char** argv)
+{
+    AesNI_StatusCode status = AESNI_SUCCESS;
+
+    for (--argc, ++argv; argc > -1; --argc, ++argv)
+    {
+        AesNI_Block128 plaintext, ciphertext, iv;
+        AesNI_Aes256_Key key;
+        AesNI_Aes256_RoundKeys encryption_keys;
+
+        if (argc < 2)
+            exit_with_usage();
+
+        if (aesni_is_error(status = aesni_aes256_parse_key(&key, *argv, NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        if (aesni_is_error(status = aesni_aes_parse_block(&iv, argv[1], NULL)))
+        {
+            print_error(status);
+            exit_with_usage();
+        }
+
+        aesni_aes256_expand_key(&key, &encryption_keys);
+
+        for (argc -= 2, argv += 2; argc > 0; --argc, ++argv)
+        {
+            if (strcmp("--", *argv) == 0)
+                break;
+
+            if (aesni_is_error(status = aesni_aes_parse_block(&plaintext, *argv, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+
+            ciphertext = aesni_aes256_encrypt_block_ofb(plaintext, &encryption_keys, iv, &iv);
+
+            if (aesni_is_error(status = aesni_aes_print_block(&ciphertext, NULL)))
+            {
+                print_error(status);
+                continue;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/utils/block/cxx/CMakeLists.txt b/utils/block/cxx/CMakeLists.txt
new file mode 100644
index 0000000..8df91d0
--- /dev/null
+++ b/utils/block/cxx/CMakeLists.txt
@@ -0,0 +1,11 @@
+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/cxx/README.md b/utils/block/cxx/README.md
new file mode 100644
index 0000000..bce2434
--- /dev/null
+++ b/utils/block/cxx/README.md
@@ -0,0 +1,60 @@
+# 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
diff --git a/utils/block/cxx/aes_common.hpp b/utils/block/cxx/aes_common.hpp
new file mode 100644
index 0000000..78126e5
--- /dev/null
+++ b/utils/block/cxx/aes_common.hpp
@@ -0,0 +1,134 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#pragma once
+
+#include <aesni/all.h>
+
+#include <boost/algorithm/string.hpp>
+#include <boost/program_options.hpp>
+
+#include <cstdlib>
+
+#include <deque>
+#include <iostream>
+#include <iterator>
+#include <istream>
+#include <string>
+#include <vector>
+
+static std::istream& operator>>(std::istream& is, AesNI_Mode& dest)
+{
+    std::string src;
+    is >> src;
+
+    if (boost::iequals(src, "ecb"))
+        dest = AESNI_ECB;
+    else if (boost::iequals(src, "cbc"))
+        dest = AESNI_CBC;
+    else if (boost::iequals(src, "cfb"))
+        dest = AESNI_CFB;
+    else if (boost::iequals(src, "ofb"))
+        dest = AESNI_OFB;
+    else if (boost::iequals(src, "ctr"))
+        dest = AESNI_CTR;
+    else
+        throw boost::program_options::validation_error(boost::program_options::validation_error::invalid_option_value, "mode", src);
+
+    return is;
+}
+
+static std::istream& operator>>(std::istream& is, AesNI_Algorithm& dest)
+{
+    std::string src;
+    is >> src;
+
+    if (boost::iequals(src, "aes128"))
+        dest = AESNI_AES128;
+    else if (boost::iequals(src, "aes192"))
+        dest = AESNI_AES192;
+    else if (boost::iequals(src, "aes256"))
+        dest = AESNI_AES256;
+    else
+        throw boost::program_options::validation_error(boost::program_options::validation_error::invalid_option_value, "algorithm", src);
+
+    return is;
+}
+
+namespace
+{
+    class CommandLineParser
+    {
+    public:
+        CommandLineParser(const std::string& program_name)
+            : m_program_name(program_name)
+            , m_options("Options")
+        { }
+
+        bool parse_options(int argc, char** argv)
+        {
+            namespace po = boost::program_options;
+
+            m_options.add_options()
+                ("help,h", "show this message and exit")
+                ("mode,m", po::value<AesNI_Mode>(&m_mode)->required(), "set mode of operation")
+                ("algorithm,a", po::value<AesNI_Algorithm>(&m_algorithm)->required(), "set algorithm");
+
+            po::options_description hidden_options;
+            hidden_options.add_options()
+                ("positional", po::value<std::vector<std::string>>(&m_args));
+
+            po::options_description all_options;
+            all_options.add(m_options).add(hidden_options);
+
+            po::positional_options_description positional_options;
+            positional_options.add("positional", -1);
+
+            po::variables_map vm;
+            po::store(po::command_line_parser(argc, argv).options(all_options).positional(positional_options).run(), vm);
+
+            if (vm.count("help"))
+            {
+                print_usage();
+                return false;
+            }
+
+            po::notify(vm);
+            return true;
+        }
+
+        void print_usage()
+        {
+            std::cout << "Usage: " << m_program_name << " [OPTIONS...] [-- KEY [IV] [PLAINTEXT...]...]\n";
+            std::cout << m_options << "\n";
+        }
+
+        AesNI_Mode get_mode() const
+        {
+            return m_mode;
+        }
+
+        AesNI_Algorithm get_algorithm() const
+        {
+            return m_algorithm;
+        }
+
+        std::deque<std::string> get_args()
+        {
+            return { std::make_move_iterator(m_args.begin()), std::make_move_iterator(m_args.end()) };
+        }
+
+    private:
+        const std::string m_program_name;
+        boost::program_options::options_description m_options;
+
+        AesNI_Mode m_mode;
+        AesNI_Algorithm m_algorithm;
+        std::vector<std::string> m_args;
+    };
+}
diff --git a/utils/block/cxx/aes_decrypt_block.cpp b/utils/block/cxx/aes_decrypt_block.cpp
new file mode 100644
index 0000000..9898d4e
--- /dev/null
+++ b/utils/block/cxx/aes_decrypt_block.cpp
@@ -0,0 +1,122 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include "aes_common.hpp"
+
+#include <aesni/all.h>
+
+#include <aesnixx/all.hpp>
+
+#include <exception>
+#include <iostream>
+
+int main(int argc, char** argv)
+{
+    try
+    {
+        CommandLineParser cmd_parser("encrypt_block_aes.exe");
+
+        if (!cmd_parser.parse_options(argc, argv))
+            return 0;
+
+        auto args = cmd_parser.get_args();
+
+        while (!args.empty())
+        {
+            AesNI_BoxAlgorithmParams algorithm_params;
+
+            switch (cmd_parser.get_algorithm())
+            {
+                case AESNI_AES128:
+                    aesni::aes::from_string(algorithm_params.aes128_key, args.front());
+                    break;
+
+                case AESNI_AES192:
+                    aesni::aes::from_string(algorithm_params.aes192_key, args.front());
+                    break;
+
+                case AESNI_AES256:
+                    aesni::aes::from_string(algorithm_params.aes256_key, args.front());
+                    break;
+            }
+
+            args.pop_front();
+
+            AesNI_BoxBlock iv;
+            AesNI_BoxBlock* iv_ptr = nullptr;
+
+            switch (cmd_parser.get_mode())
+            {
+                case AESNI_ECB:
+                    break;
+
+                case AESNI_CBC:
+                case AESNI_CFB:
+                case AESNI_OFB:
+                case AESNI_CTR:
+                    if (args.empty())
+                    {
+                        cmd_parser.print_usage();
+                        return 1;
+                    }
+                    aesni::aes::from_string(iv.aes_block, args.front());
+                    iv_ptr = &iv;
+                    args.pop_front();
+                    break;
+            }
+
+            AesNI_Box box;
+            aesni_box_init(
+                &box,
+                cmd_parser.get_algorithm(),
+                &algorithm_params,
+                cmd_parser.get_mode(),
+                iv_ptr,
+                aesni::ErrorDetailsThrowsInDestructor());
+
+            while (!args.empty())
+            {
+                if (args.front() == "--")
+                {
+                    args.pop_front();
+                    break;
+                }
+
+                AesNI_BoxBlock ciphertext;
+                aesni::aes::from_string(ciphertext.aes_block, args.front());
+                args.pop_front();
+
+                AesNI_BoxBlock plaintext;
+                aesni_box_decrypt_block(
+                    &box,
+                    &ciphertext,
+                    &plaintext,
+                    aesni::ErrorDetailsThrowsInDestructor());
+
+                std::cout << aesni::aes::to_string(plaintext.aes_block) << "\n";
+            }
+        }
+
+        return 0;
+    }
+    catch (const boost::program_options::error& e)
+    {
+        std::cerr << "Usage error: " << e.what() << "\n";
+        return 1;
+    }
+    catch (const aesni::Error& e)
+    {
+        std::cerr << e;
+        return 1;
+    }
+    catch (const std::exception& e)
+    {
+        std::cerr << e.what() << "\n";
+        return 1;
+    }
+}
diff --git a/utils/block/cxx/aes_encrypt_block.cpp b/utils/block/cxx/aes_encrypt_block.cpp
new file mode 100644
index 0000000..9458831
--- /dev/null
+++ b/utils/block/cxx/aes_encrypt_block.cpp
@@ -0,0 +1,122 @@
+/**
+ * \file
+ * \author Egor Tensin <Egor.Tensin@gmail.com>
+ * \date 2015
+ * \copyright This file is licensed under the terms of the MIT License.
+ *            See LICENSE.txt for details.
+ */
+
+#include "aes_common.hpp"
+
+#include <aesni/all.h>
+
+#include <aesnixx/all.hpp>
+
+#include <exception>
+#include <iostream>
+
+int main(int argc, char** argv)
+{
+    try
+    {
+        CommandLineParser cmd_parser("encrypt_block_aes.exe");
+
+        if (!cmd_parser.parse_options(argc, argv))
+            return 0;
+
+        auto args = cmd_parser.get_args();
+
+        while (!args.empty())
+        {
+            AesNI_BoxAlgorithmParams algorithm_params;
+
+            switch (cmd_parser.get_algorithm())
+            {
+                case AESNI_AES128:
+                    aesni::aes::from_string(algorithm_params.aes128_key, args.front());
+                    break;
+
+                case AESNI_AES192:
+                    aesni::aes::from_string(algorithm_params.aes192_key, args.front());
+                    break;
+
+                case AESNI_AES256:
+                    aesni::aes::from_string(algorithm_params.aes256_key, args.front());
+                    break;
+            }
+
+            args.pop_front();
+
+            AesNI_BoxBlock iv;
+            AesNI_BoxBlock* iv_ptr = nullptr;
+
+            switch (cmd_parser.get_mode())
+            {
+                case AESNI_ECB:
+                    break;
+
+                case AESNI_CBC:
+                case AESNI_CFB:
+                case AESNI_OFB:
+                case AESNI_CTR:
+                    if (args.empty())
+                    {
+                        cmd_parser.print_usage();
+                        return 1;
+                    }
+                    aesni::aes::from_string(iv.aes_block, args.front());
+                    iv_ptr = &iv;
+                    args.pop_front();
+                    break;
+            }
+
+            AesNI_Box box;
+            aesni_box_init(
+                &box,
+                cmd_parser.get_algorithm(),
+                &algorithm_params,
+                cmd_parser.get_mode(),
+                iv_ptr,
+                aesni::ErrorDetailsThrowsInDestructor());
+
+            while (!args.empty())
+            {
+                if (args.front() == "--")
+                {
+                    args.pop_front();
+                    break;
+                }
+
+                AesNI_BoxBlock plaintext;
+                aesni::aes::from_string(plaintext.aes_block, args.front());
+                args.pop_front();
+
+                AesNI_BoxBlock ciphertext;
+                aesni_box_encrypt_block(
+                    &box,
+                    &plaintext,
+                    &ciphertext,
+                    aesni::ErrorDetailsThrowsInDestructor());
+
+                std::cout << aesni::aes::to_string(ciphertext.aes_block) << "\n";
+            }
+        }
+
+        return 0;
+    }
+    catch (const boost::program_options::error& e)
+    {
+        std::cerr << "Usage error: " << e.what() << "\n";
+        return 1;
+    }
+    catch (const aesni::Error& e)
+    {
+        std::cerr << e;
+        return 1;
+    }
+    catch (const std::exception& e)
+    {
+        std::cerr << e.what() << "\n";
+        return 1;
+    }
+}
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