add block formatting/printing functions

4 files changed, 98 insertions, 59 deletions

diff --git a/examples/aes128_example.c b/examples/aes128_example.c
index b4f689f..afb8dd9 100644
--- a/examples/aes128_example.c
+++ b/examples/aes128_example.c
@@ -12,24 +12,31 @@
 
 int main()
 {
-    __declspec(align(16)) AesBlock plain, key, cypher, decrypted;
+    __declspec(align(16)) AesBlock128 plain, key, cypher, decrypted;
 
-    plain = make_aes_block(0xffeeddcc, 0xbbaa9988, 0x77665544, 0x33221100);
-    key   = make_aes_block(0x0f0e0d0c, 0x0b0a0908, 0x07060504, 0x03020100);
+    plain = make_aes_block128(0xffeeddcc, 0xbbaa9988, 0x77665544, 0x33221100);
+    key   = make_aes_block128(0x0f0e0d0c, 0x0b0a0908, 0x07060504, 0x03020100);
 
-    printf("Plain:\n");
-    print_aes_block(plain);
+    printf("Plain: %s\n", format_aes_block128(&plain).str);
+    printf("       %s\n", format_aes_block128_fips_style(&plain).str);
+    print_aes_block128_fips_matrix_style(&plain);
 
-    printf("\nKey:\n");
-    print_aes_block(key);
+    printf("\n");
+    printf("Key: %s\n", format_aes_block128(&key).str);
+    printf("     %s\n", format_aes_block128_fips_style(&key).str);
+    print_aes_block128_fips_matrix_style(&key);
 
-    printf("\nCypher:\n");
     cypher = aes128ecb_encrypt(plain, key);
-    print_aes_block(cypher);
+    printf("\n");
+    printf("Cypher: %s\n", format_aes_block128(&cypher).str);
+    printf("        %s\n", format_aes_block128_fips_style(&cypher).str);
+    print_aes_block128_fips_matrix_style(&cypher);
 
-    printf("\nDecrypted:\n");
     decrypted = aes128ecb_decrypt(cypher, key);
-    print_aes_block(decrypted);
+    printf("\n");
+    printf("Decrypted: %s\n", format_aes_block128(&decrypted).str);
+    printf("           %s\n", format_aes_block128_fips_style(&decrypted).str);
+    print_aes_block128_fips_matrix_style(&decrypted);
 
     return 0;
 }
diff --git a/examples/aes192_example.c b/examples/aes192_example.c
index dd22d80..a310ab2 100644
--- a/examples/aes192_example.c
+++ b/examples/aes192_example.c
@@ -12,28 +12,38 @@
 
 int main()
 {
-    __declspec(align(16)) AesBlock plain, cypher, decrypted;
-    __declspec(align(16)) AesBlock key_low, key_high;
+    __declspec(align(16)) AesBlock128 plain, cypher, decrypted;
+    __declspec(align(16)) AesBlock128 key_low, key_high;
 
-    plain    = make_aes_block(0xffeeddcc, 0xbbaa9988, 0x77665544, 0x33221100);
-    key_low  = make_aes_block(0x0f0e0d0c, 0x0b0a0908, 0x07060504, 0x03020100);
-    key_high = make_aes_block(         0,          0, 0x17161514, 0x13121110);
+    plain    = make_aes_block128(0xffeeddcc, 0xbbaa9988, 0x77665544, 0x33221100);
+    key_low  = make_aes_block128(0x0f0e0d0c, 0x0b0a0908, 0x07060504, 0x03020100);
+    key_high = make_aes_block128(         0,          0, 0x17161514, 0x13121110);
 
-    printf("Plain:\n");
-    print_aes_block(plain);
+    printf("Plain: %s\n", format_aes_block128(&plain).str);
+    printf("       %s\n", format_aes_block128_fips_style(&plain).str);
+    print_aes_block128_fips_matrix_style(&plain);
 
-    printf("\nKey low:\n");
-    print_aes_block(key_low);
-    printf("\nKey high:\n");
-    print_aes_block(key_high);
+    printf("\n");
+    printf("Key (low): %s\n", format_aes_block128(&key_low).str);
+    printf("           %s\n", format_aes_block128_fips_style(&key_low).str);
+    print_aes_block128_fips_matrix_style(&key_low);
+
+    printf("\n");
+    printf("Key (high): %s\n", format_aes_block128(&key_high).str);
+    printf("            %s\n", format_aes_block128_fips_style(&key_high).str);
+    print_aes_block128_fips_matrix_style(&key_high);
 
-    printf("\nCypher:\n");
     cypher = aes192ecb_encrypt(plain, key_low, key_high);
-    print_aes_block(cypher);
+    printf("\n");
+    printf("Cypher: %s\n", format_aes_block128(&cypher).str);
+    printf("        %s\n", format_aes_block128_fips_style(&cypher).str);
+    print_aes_block128_fips_matrix_style(&cypher);
 
-    printf("\nDecrypted:\n");
     decrypted = aes192ecb_decrypt(cypher, key_low, key_high);
-    print_aes_block(decrypted);
+    printf("\n");
+    printf("Decrypted: %s\n", format_aes_block128(&decrypted).str);
+    printf("           %s\n", format_aes_block128_fips_style(&decrypted).str);
+    print_aes_block128_fips_matrix_style(&decrypted);
 
     return 0;
 }
diff --git a/examples/aes256cbc_example.c b/examples/aes256cbc_example.c
index 1fcc615..2847f41 100644
--- a/examples/aes256cbc_example.c
+++ b/examples/aes256cbc_example.c
@@ -12,32 +12,44 @@
 
 int main()
 {
-    __declspec(align(16)) AesBlock plain, cypher, decrypted;
-    __declspec(align(16)) AesBlock key_low, key_high, iv;
+    __declspec(align(16)) AesBlock128 plain, cypher, decrypted;
+    __declspec(align(16)) AesBlock128 key_low, key_high, iv;
 
-    plain    = make_aes_block(0xffeeddcc, 0xbbaa9988, 0x77665544, 0x33221100);
-    key_low  = make_aes_block(0x0f0e0d0c, 0x0b0a0908, 0x07060504, 0x03020100);
-    key_high = make_aes_block(0x1f1e1d1c, 0x1b1a1918, 0x17161514, 0x13121110);
-    iv       = make_aes_block(0xfedcba98, 0x76543210, 0xfedcba98, 0x76543210);
+    plain    = make_aes_block128(0xffeeddcc, 0xbbaa9988, 0x77665544, 0x33221100);
+    key_low  = make_aes_block128(0x0f0e0d0c, 0x0b0a0908, 0x07060504, 0x03020100);
+    key_high = make_aes_block128(0x1f1e1d1c, 0x1b1a1918, 0x17161514, 0x13121110);
+    iv       = make_aes_block128(0xfedcba98, 0x76543210, 0xfedcba98, 0x76543210);
 
-    printf("Plain:\n");
-    print_aes_block(plain);
+    printf("Plain: %s\n", format_aes_block128(&plain).str);
+    printf("       %s\n", format_aes_block128_fips_style(&plain).str);
+    print_aes_block128_fips_matrix_style(&plain);
 
-    printf("\nKey low:\n");
-    print_aes_block(key_low);
-    printf("\nKey high:\n");
-    print_aes_block(key_high);
+    printf("\n");
+    printf("Key (low): %s\n", format_aes_block128(&key_low).str);
+    printf("           %s\n", format_aes_block128_fips_style(&key_low).str);
+    print_aes_block128_fips_matrix_style(&key_low);
 
-    printf("\nInitialization vector:\n");
-    print_aes_block(iv);
+    printf("\n");
+    printf("Key (high): %s\n", format_aes_block128(&key_high).str);
+    printf("            %s\n", format_aes_block128_fips_style(&key_high).str);
+    print_aes_block128_fips_matrix_style(&key_high);
+
+    printf("\n");
+    printf("Initialization vector: %s\n", format_aes_block128(&iv).str);
+    printf("                       %s\n", format_aes_block128_fips_style(&iv).str);
+    print_aes_block128_fips_matrix_style(&iv);
 
-    printf("\nCypher:\n");
     cypher = aes256cbc_encrypt(plain, key_low, key_high, &iv);
-    print_aes_block(cypher);
+    printf("\n");
+    printf("Cypher: %s\n", format_aes_block128(&cypher).str);
+    printf("        %s\n", format_aes_block128_fips_style(&cypher).str);
+    print_aes_block128_fips_matrix_style(&cypher);
 
-    printf("\nDecrypted:\n");
     decrypted = aes256cbc_decrypt(cypher, key_low, key_high, &iv);
-    print_aes_block(decrypted);
+    printf("\n");
+    printf("Decrypted: %s\n", format_aes_block128(&decrypted).str);
+    printf("           %s\n", format_aes_block128_fips_style(&decrypted).str);
+    print_aes_block128_fips_matrix_style(&decrypted);
 
     return 0;
 }
diff --git a/examples/aes256ecb_example.c b/examples/aes256ecb_example.c
index 25ec61c..c15082d 100644
--- a/examples/aes256ecb_example.c
+++ b/examples/aes256ecb_example.c
@@ -12,28 +12,38 @@
 
 int main()
 {
-    __declspec(align(16)) AesBlock plain, cypher, decrypted;
-    __declspec(align(16)) AesBlock key_low, key_high;
+    __declspec(align(16)) AesBlock128 plain, cypher, decrypted;
+    __declspec(align(16)) AesBlock128 key_low, key_high;
 
-    plain    = make_aes_block(0xffeeddcc, 0xbbaa9988, 0x77665544, 0x33221100);
-    key_low  = make_aes_block(0x0f0e0d0c, 0x0b0a0908, 0x07060504, 0x03020100);
-    key_high = make_aes_block(0x1f1e1d1c, 0x1b1a1918, 0x17161514, 0x13121110);
+    plain    = make_aes_block128(0xffeeddcc, 0xbbaa9988, 0x77665544, 0x33221100);
+    key_low  = make_aes_block128(0x0f0e0d0c, 0x0b0a0908, 0x07060504, 0x03020100);
+    key_high = make_aes_block128(0x1f1e1d1c, 0x1b1a1918, 0x17161514, 0x13121110);
 
-    printf("Plain:\n");
-    print_aes_block(plain);
+    printf("Plain: %s\n", format_aes_block128(&plain).str);
+    printf("       %s\n", format_aes_block128_fips_style(&plain).str);
+    print_aes_block128_fips_matrix_style(&plain);
 
-    printf("\nKey low:\n");
-    print_aes_block(key_low);
-    printf("\nKey high:\n");
-    print_aes_block(key_high);
+    printf("\n");
+    printf("Key (low): %s\n", format_aes_block128(&key_low).str);
+    printf("           %s\n", format_aes_block128_fips_style(&key_low).str);
+    print_aes_block128_fips_matrix_style(&key_low);
+
+    printf("\n");
+    printf("Key (high): %s\n", format_aes_block128(&key_high).str);
+    printf("            %s\n", format_aes_block128_fips_style(&key_high).str);
+    print_aes_block128_fips_matrix_style(&key_high);
 
-    printf("\nCypher:\n");
     cypher = aes256ecb_encrypt(plain, key_low, key_high);
-    print_aes_block(cypher);
+    printf("\n");
+    printf("Cypher: %s\n", format_aes_block128(&cypher).str);
+    printf("        %s\n", format_aes_block128_fips_style(&cypher).str);
+    print_aes_block128_fips_matrix_style(&cypher);
 
-    printf("\nDecrypted:\n");
     decrypted = aes256ecb_decrypt(cypher, key_low, key_high);
-    print_aes_block(decrypted);
+    printf("\n");
+    printf("Decrypted: %s\n", format_aes_block128(&decrypted).str);
+    printf("           %s\n", format_aes_block128_fips_style(&decrypted).str);
+    print_aes_block128_fips_matrix_style(&decrypted);
 
     return 0;
 }