2 files changed, 55 insertions, 111 deletions
diff --git a/examples/aes256cbc.c b/examples/aes256cbc.c
deleted file mode 100644
index f62fc84..0000000
--- a/examples/aes256cbc.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * \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>
-
-int main()
-{
-    AesNI_Block128 plain, cipher, decrypted, iv, next_iv;
-    AesNI_Block256 key;
-    AesNI_KeySchedule256 key_schedule, inverted_schedule;
-
-    plain = aesni_make_block128(0xffeeddcc, 0xbbaa9988, 0x77665544, 0x33221100);
-    key = aesni_make_block256(0x1f1e1d1c, 0x1b1a1918, 0x17161514, 0x13121110, 0x0f0e0d0c, 0x0b0a0908, 0x07060504, 0x03020100);
-    iv = aesni_make_block128(0xfedcba98, 0x76543210, 0xfedcba98, 0x76543210);
-
-    {
-        AesNI_BlockString128 str;
-        aesni_format_block128(&str, &plain, NULL);
-        printf("Plain: %s\n", str.str);
-        aesni_print_block128_as_matrix(&plain, NULL);
-    }
-
-    printf("\n");
-
-    {
-        AesNI_BlockString256 str;
-        aesni_format_block256(&str, &key, NULL);
-        printf("Key: %s\n", str.str);
-        aesni_print_block256_as_matrix(&key, NULL);
-    }
-
-    printf("\n");
-
-    {
-        AesNI_BlockString128 str;
-        aesni_format_block128(&str, &iv, NULL);
-        printf("Initialization vector: %s\n", str.str);
-        aesni_print_block128_as_matrix(&iv, NULL);
-    }
-
-    aesni_expand_key_schedule256(&key, &key_schedule);
-
-    printf("\n");
-    printf("Key schedule:\n");
-    for (int i = 0; i < 15; ++i)
-    {
-        AesNI_BlockString128 str;
-        aesni_format_block128(&str, &key_schedule.keys[i], NULL);
-        printf("\t[%d]: %s\n", i, str.str);
-    }
-
-    cipher = aesni_encrypt_block_cbc256(plain, &key_schedule, iv, &next_iv);
-
-    printf("\n");
-
-    {
-        AesNI_BlockString128 str;
-        aesni_format_block128(&str, &cipher, NULL);
-        printf("Cipher: %s\n", str.str);
-        aesni_print_block128_as_matrix(&cipher, NULL);
-    }
-
-    printf("\n");
-
-    {
-        AesNI_BlockString128 str;
-        aesni_format_block128(&str, &next_iv, NULL);
-        printf("Next initialization vector: %s\n", str.str);
-        aesni_print_block128_as_matrix(&next_iv, NULL);
-    }
-
-    aesni_invert_key_schedule256(&key_schedule, &inverted_schedule);
-
-    printf("\n");
-    printf("Inverted key schedule:\n");
-    for (int i = 0; i < 15; ++i)
-    {
-        AesNI_BlockString128 str;
-        aesni_format_block128(&str, &inverted_schedule.keys[i], NULL);
-        printf("\t[%d]: %s\n", i, str.str);
-    }
-
-    decrypted = aesni_decrypt_block_cbc256(cipher, &inverted_schedule, iv, &next_iv);
-
-    printf("\n");
-
-    {
-        AesNI_BlockString128 str;
-        aesni_format_block128(&str, &decrypted, NULL);
-        printf("Decrypted: %s\n", str.str);
-        aesni_print_block128_as_matrix(&decrypted, NULL);
-    }
-
-    printf("\n");
-
-    {
-        AesNI_BlockString128 str;
-        aesni_format_block128(&str, &next_iv, NULL);
-        printf("Next initialization vector: %s\n", str.str);
-        aesni_print_block128_as_matrix(&next_iv, NULL);
-    }
-
-    return 0;
-}
diff --git a/examples/aes256cbc.cpp b/examples/aes256cbc.cpp
new file mode 100644
index 0000000..0253adb
--- /dev/null
+++ b/examples/aes256cbc.cpp
@@ -0,0 +1,55 @@
+/**
+ * \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 "common.hpp"
+
+#include <aesni/all.h>
+
+#include <aesnixx/all.hpp>
+
+#include <exception>
+#include <iostream>
+
+int main()
+{
+    try
+    {
+        aesni::Block128 plaintext;
+        make_default_plaintext(plaintext);
+
+        aesni::Block256 key;
+        make_default_key(key);
+
+        aesni::Block128 iv;
+        make_default_iv(iv);
+
+        aesni::KeySchedule256 encryption_schedule;
+        aesni_expand_key_schedule256(&key, &encryption_schedule);
+        dump_encryption_schedule(encryption_schedule);
+
+        aesni::Block128 next_iv;
+        const auto ciphertext = aesni_encrypt_block_cbc256(plaintext, &encryption_schedule, iv, &next_iv);
+        dump_ciphertext(ciphertext);
+        dump_next_iv(next_iv);
+
+        aesni::KeySchedule256 decryption_schedule;
+        aesni_invert_key_schedule256(&encryption_schedule, &decryption_schedule);
+        dump_decryption_schedule(decryption_schedule);
+
+        const auto decrypted = aesni_decrypt_block_cbc256(ciphertext, &decryption_schedule, iv, &next_iv);
+        dump_decrypted(decrypted);
+        dump_next_iv(next_iv);
+
+        return 0;
+    }
+    catch (const std::exception& e)
+    {
+        std::cerr << e.what() << "\n";
+        return 1;
+    }
+}