1 files changed, 60 insertions, 16 deletions

diff --git a/examples/aes128cbc.c b/examples/aes128cbc.c
index b2eb14a..5d828a3 100644
--- a/examples/aes128cbc.c
+++ b/examples/aes128cbc.c
@@ -19,48 +19,92 @@ int main()
     key = aesni_make_block128(0x0f0e0d0c, 0x0b0a0908, 0x07060504, 0x03020100);
     iv = aesni_make_block128(0xfedcba98, 0x76543210, 0xfedcba98, 0x76543210);
 
-    printf("Plain: %s\n", aesni_format_block128(&plain).str);
-    aesni_print_block128_as_matrix(&plain);
+    {
+        AesNI_BlockString128 str;
+        aesni_format_block128(&str, &plain, NULL);
+        printf("Plain: %s\n", str.str);
+        aesni_print_block128_as_matrix(&plain, NULL);
+    }
 
     printf("\n");
-    printf("Key: %s\n", aesni_format_block128(&key).str);
-    aesni_print_block128_as_matrix(&key);
+
+    {
+        AesNI_BlockString128 str;
+        aesni_format_block128(&str, &key, NULL);
+        printf("Key: %s\n", str.str);
+        aesni_print_block128_as_matrix(&key, NULL);
+    }
 
     printf("\n");
-    printf("Initialization vector: %s\n", aesni_format_block128(&iv).str);
-    aesni_print_block128_as_matrix(&iv);
+
+    {
+        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_schedule128(key, &key_schedule);
 
     printf("\n");
     printf("Key schedule:\n");
     for (int i = 0; i < 11; ++i)
-        printf("\t[%d]: %s\n", i, aesni_format_block128(&key_schedule.keys[i]).str);
+    {
+        AesNI_BlockString128 str;
+        aesni_format_block128(&str, &key_schedule.keys[i], NULL);
+        printf("\t[%d]: %s\n", i, str.str);
+    }
 
     cipher = aesni_encrypt_block_cbc128(plain, &key_schedule, iv, &next_iv);
+
     printf("\n");
-    printf("Cipher: %s\n", aesni_format_block128(&cipher).str);
-    aesni_print_block128_as_matrix(&cipher);
+
+    {
+        AesNI_BlockString128 str;
+        aesni_format_block128(&str, &cipher, NULL);
+        printf("Cipher: %s\n", str.str);
+        aesni_print_block128_as_matrix(&cipher, NULL);
+    }
 
     printf("\n");
-    printf("Next initialization vector: %s\n", aesni_format_block128(&next_iv).str);
-    aesni_print_block128_as_matrix(&next_iv);
+
+    {
+        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_schedule128(&key_schedule, &inverted_schedule);
 
     printf("\n");
     printf("Inverted key schedule:\n");
     for (int i = 0; i < 11; ++i)
-        printf("\t[%d]: %s\n", i, aesni_format_block128(&inverted_schedule.keys[i]).str);
+    {
+        AesNI_BlockString128 str;
+        aesni_format_block128(&str, &inverted_schedule.keys[i], NULL);
+        printf("\t[%d]: %s\n", i, str.str);
+    }
 
     decrypted = aesni_decrypt_block_cbc128(cipher, &inverted_schedule, iv, &next_iv);
+
     printf("\n");
-    printf("Decrypted: %s\n", aesni_format_block128(&decrypted).str);
-    aesni_print_block128_as_matrix(&decrypted);
+
+    {
+        AesNI_BlockString128 str;
+        aesni_format_block128(&str, &decrypted, NULL);
+        printf("Decrypted: %s\n", str.str);
+        aesni_print_block128_as_matrix(&decrypted, NULL);
+    }
 
     printf("\n");
-    printf("Next initialization vector: %s\n", aesni_format_block128(&next_iv).str);
-    aesni_print_block128_as_matrix(&next_iv);
+
+    {
+        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;
 }