init vectors are calculated by API functions

9 files changed, 99 insertions, 27 deletions

diff --git a/examples/aes128cbc_example.c b/examples/aes128cbc_example.c
index 53156c4..44df122 100644
--- a/examples/aes128cbc_example.c
+++ b/examples/aes128cbc_example.c
@@ -12,7 +12,7 @@
 
 int main()
 {
-    __declspec(align(16)) AesBlock128 plain, key, cypher, decrypted, iv;
+    __declspec(align(16)) AesBlock128 plain, key, cypher, decrypted, iv, next_iv;
     __declspec(align(16)) Aes128KeySchedule key_schedule, inverted_schedule;
 
     plain = make_aes_block128(0xffeeddcc, 0xbbaa9988, 0x77665544, 0x33221100);
@@ -37,11 +37,15 @@ int main()
     for (int i = 0; i < 11; ++i)
         printf("\t[%d]: %s\n", i, format_aes_block128(&key_schedule.keys[i]).str);
 
-    cypher = aes128cbc_encrypt(plain, &key_schedule, iv);
+    cypher = aes128cbc_encrypt(plain, &key_schedule, iv, &next_iv);
     printf("\n");
     printf("Cypher: %s\n", format_aes_block128(&cypher).str);
     print_aes_block128_fips_matrix_style(&cypher);
 
+    printf("\n");
+    printf("Next initialization vector: %s\n", format_aes_block128(&next_iv).str);
+    print_aes_block128_fips_matrix_style(&next_iv);
+
     aes128_invert_key_schedule(&key_schedule, &inverted_schedule);
 
     printf("\n");
@@ -49,10 +53,14 @@ int main()
     for (int i = 0; i < 11; ++i)
         printf("\t[%d]: %s\n", i, format_aes_block128(&inverted_schedule.keys[i]).str);
 
-    decrypted = aes128cbc_decrypt(cypher, &inverted_schedule, iv);
+    decrypted = aes128cbc_decrypt(cypher, &inverted_schedule, iv, &next_iv);
     printf("\n");
     printf("Decrypted: %s\n", format_aes_block128(&decrypted).str);
     print_aes_block128_fips_matrix_style(&decrypted);
 
+    printf("\n");
+    printf("Next initialization vector: %s\n", format_aes_block128(&next_iv).str);
+    print_aes_block128_fips_matrix_style(&next_iv);
+
     return 0;
 }
diff --git a/examples/aes128cfb_example.c b/examples/aes128cfb_example.c
index c466c11..9d63a9a 100644
--- a/examples/aes128cfb_example.c
+++ b/examples/aes128cfb_example.c
@@ -12,7 +12,7 @@
 
 int main()
 {
-    __declspec(align(16)) AesBlock128 plain, key, cypher, decrypted, iv;
+    __declspec(align(16)) AesBlock128 plain, key, cypher, decrypted, iv, next_iv;
     __declspec(align(16)) Aes128KeySchedule key_schedule;
 
     plain = make_aes_block128(0xffeeddcc, 0xbbaa9988, 0x77665544, 0x33221100);
@@ -37,15 +37,23 @@ int main()
     for (int i = 0; i < 11; ++i)
         printf("\t[%d]: %s\n", i, format_aes_block128(&key_schedule.keys[i]).str);
 
-    cypher = aes128cfb_encrypt(plain, &key_schedule, iv);
+    cypher = aes128cfb_encrypt(plain, &key_schedule, iv, &next_iv);
     printf("\n");
     printf("Cypher: %s\n", format_aes_block128(&cypher).str);
     print_aes_block128_fips_matrix_style(&cypher);
 
-    decrypted = aes128cfb_decrypt(cypher, &key_schedule, iv);
+    printf("\n");
+    printf("Next initialization vector: %s\n", format_aes_block128(&next_iv).str);
+    print_aes_block128_fips_matrix_style(&next_iv);
+
+    decrypted = aes128cfb_decrypt(cypher, &key_schedule, iv, &next_iv);
     printf("\n");
     printf("Decrypted: %s\n", format_aes_block128(&decrypted).str);
     print_aes_block128_fips_matrix_style(&decrypted);
 
+    printf("\n");
+    printf("Next initialization vector: %s\n", format_aes_block128(&next_iv).str);
+    print_aes_block128_fips_matrix_style(&next_iv);
+
     return 0;
 }
diff --git a/examples/aes128ofb_example.c b/examples/aes128ofb_example.c
index 07137f6..7685008 100644
--- a/examples/aes128ofb_example.c
+++ b/examples/aes128ofb_example.c
@@ -12,7 +12,7 @@
 
 int main()
 {
-    __declspec(align(16)) AesBlock128 plain, key, cypher, decrypted, iv;
+    __declspec(align(16)) AesBlock128 plain, key, cypher, decrypted, iv, next_iv;
     __declspec(align(16)) Aes128KeySchedule key_schedule;
 
     plain = make_aes_block128(0xffeeddcc, 0xbbaa9988, 0x77665544, 0x33221100);
@@ -37,15 +37,23 @@ int main()
     for (int i = 0; i < 11; ++i)
         printf("\t[%d]: %s\n", i, format_aes_block128(&key_schedule.keys[i]).str);
 
-    cypher = aes128ofb_encrypt(plain, &key_schedule, iv);
+    cypher = aes128ofb_encrypt(plain, &key_schedule, iv, &next_iv);
     printf("\n");
     printf("Cypher: %s\n", format_aes_block128(&cypher).str);
     print_aes_block128_fips_matrix_style(&cypher);
 
-    decrypted = aes128ofb_decrypt(cypher, &key_schedule, iv);
+    printf("\n");
+    printf("Next initialization vector: %s\n", format_aes_block128(&next_iv).str);
+    print_aes_block128_fips_matrix_style(&next_iv);
+
+    decrypted = aes128ofb_decrypt(cypher, &key_schedule, iv, &next_iv);
     printf("\n");
     printf("Decrypted: %s\n", format_aes_block128(&decrypted).str);
     print_aes_block128_fips_matrix_style(&decrypted);
 
+    printf("\n");
+    printf("Next initialization vector: %s\n", format_aes_block128(&next_iv).str);
+    print_aes_block128_fips_matrix_style(&next_iv);
+
     return 0;
 }
diff --git a/examples/aes192cbc_example.c b/examples/aes192cbc_example.c
index dc6d478..2133a17 100644
--- a/examples/aes192cbc_example.c
+++ b/examples/aes192cbc_example.c
@@ -12,7 +12,7 @@
 
 int main()
 {
-    __declspec(align(16)) AesBlock128 plain, cypher, decrypted, iv;
+    __declspec(align(16)) AesBlock128 plain, cypher, decrypted, iv, next_iv;
     __declspec(align(16)) AesBlock192 key;
     __declspec(align(16)) Aes192KeySchedule key_schedule, inverted_schedule;
 
@@ -38,11 +38,15 @@ int main()
     for (int i = 0; i < 13; ++i)
         printf("\t[%d]: %s\n", i, format_aes_block128(&key_schedule.keys[i]).str);
 
-    cypher = aes192cbc_encrypt(plain, &key_schedule, iv);
+    cypher = aes192cbc_encrypt(plain, &key_schedule, iv, &next_iv);
     printf("\n");
     printf("Cypher: %s\n", format_aes_block128(&cypher).str);
     print_aes_block128_fips_matrix_style(&cypher);
 
+    printf("\n");
+    printf("Next initialization vector: %s\n", format_aes_block128(&next_iv).str);
+    print_aes_block128_fips_matrix_style(&next_iv);
+
     aes192_invert_key_schedule(&key_schedule, &inverted_schedule);
 
     printf("\n");
@@ -50,10 +54,14 @@ int main()
     for (int i = 0; i < 13; ++i)
         printf("\t[%d]: %s\n", i, format_aes_block128(&inverted_schedule.keys[i]).str);
 
-    decrypted = aes192cbc_decrypt(cypher, &inverted_schedule, iv);
+    decrypted = aes192cbc_decrypt(cypher, &inverted_schedule, iv, &next_iv);
     printf("\n");
     printf("Decrypted: %s\n", format_aes_block128(&decrypted).str);
     print_aes_block128_fips_matrix_style(&decrypted);
 
+    printf("\n");
+    printf("Next initialization vector: %s\n", format_aes_block128(&next_iv).str);
+    print_aes_block128_fips_matrix_style(&next_iv);
+
     return 0;
 }
diff --git a/examples/aes192cfb_example.c b/examples/aes192cfb_example.c
index fe6340b..d3ac8bc 100644
--- a/examples/aes192cfb_example.c
+++ b/examples/aes192cfb_example.c
@@ -12,7 +12,7 @@
 
 int main()
 {
-    __declspec(align(16)) AesBlock128 plain, cypher, decrypted, iv;
+    __declspec(align(16)) AesBlock128 plain, cypher, decrypted, iv, next_iv;
     __declspec(align(16)) AesBlock192 key;
     __declspec(align(16)) Aes192KeySchedule key_schedule;
 
@@ -38,15 +38,23 @@ int main()
     for (int i = 0; i < 13; ++i)
         printf("\t[%d]: %s\n", i, format_aes_block128(&key_schedule.keys[i]).str);
 
-    cypher = aes192cfb_encrypt(plain, &key_schedule, iv);
+    cypher = aes192cfb_encrypt(plain, &key_schedule, iv, &next_iv);
     printf("\n");
     printf("Cypher: %s\n", format_aes_block128(&cypher).str);
     print_aes_block128_fips_matrix_style(&cypher);
 
-    decrypted = aes192cfb_decrypt(cypher, &key_schedule, iv);
+    printf("\n");
+    printf("Next initialization vector: %s\n", format_aes_block128(&next_iv).str);
+    print_aes_block128_fips_matrix_style(&next_iv);
+
+    decrypted = aes192cfb_decrypt(cypher, &key_schedule, iv, &next_iv);
     printf("\n");
     printf("Decrypted: %s\n", format_aes_block128(&decrypted).str);
     print_aes_block128_fips_matrix_style(&decrypted);
 
+    printf("\n");
+    printf("Next initialization vector: %s\n", format_aes_block128(&next_iv).str);
+    print_aes_block128_fips_matrix_style(&next_iv);
+
     return 0;
 }
diff --git a/examples/aes192ofb_example.c b/examples/aes192ofb_example.c
index 6e611d0..1a50dfb 100644
--- a/examples/aes192ofb_example.c
+++ b/examples/aes192ofb_example.c
@@ -12,7 +12,7 @@
 
 int main()
 {
-    __declspec(align(16)) AesBlock128 plain, cypher, decrypted, iv;
+    __declspec(align(16)) AesBlock128 plain, cypher, decrypted, iv, next_iv;
     __declspec(align(16)) AesBlock192 key;
     __declspec(align(16)) Aes192KeySchedule key_schedule;
 
@@ -38,15 +38,23 @@ int main()
     for (int i = 0; i < 13; ++i)
         printf("\t[%d]: %s\n", i, format_aes_block128(&key_schedule.keys[i]).str);
 
-    cypher = aes192ofb_encrypt(plain, &key_schedule, iv);
+    cypher = aes192ofb_encrypt(plain, &key_schedule, iv, &next_iv);
     printf("\n");
     printf("Cypher: %s\n", format_aes_block128(&cypher).str);
     print_aes_block128_fips_matrix_style(&cypher);
 
-    decrypted = aes192ofb_decrypt(cypher, &key_schedule, iv);
+    printf("\n");
+    printf("Next initialization vector: %s\n", format_aes_block128(&next_iv).str);
+    print_aes_block128_fips_matrix_style(&next_iv);
+
+    decrypted = aes192ofb_decrypt(cypher, &key_schedule, iv, &next_iv);
     printf("\n");
     printf("Decrypted: %s\n", format_aes_block128(&decrypted).str);
     print_aes_block128_fips_matrix_style(&decrypted);
 
+    printf("\n");
+    printf("Next initialization vector: %s\n", format_aes_block128(&next_iv).str);
+    print_aes_block128_fips_matrix_style(&next_iv);
+
     return 0;
 }
diff --git a/examples/aes256cbc_example.c b/examples/aes256cbc_example.c
index 423cd5d..21ae58d 100644
--- a/examples/aes256cbc_example.c
+++ b/examples/aes256cbc_example.c
@@ -12,7 +12,7 @@
 
 int main()
 {
-    __declspec(align(16)) AesBlock128 plain, cypher, decrypted, iv;
+    __declspec(align(16)) AesBlock128 plain, cypher, decrypted, iv, next_iv;
     __declspec(align(16)) AesBlock256 key;
     __declspec(align(16)) Aes256KeySchedule key_schedule, inverted_schedule;
 
@@ -38,11 +38,15 @@ int main()
     for (int i = 0; i < 15; ++i)
         printf("\t[%d]: %s\n", i, format_aes_block128(&key_schedule.keys[i]).str);
 
-    cypher = aes256cbc_encrypt(plain, &key_schedule, iv);
+    cypher = aes256cbc_encrypt(plain, &key_schedule, iv, &next_iv);
     printf("\n");
     printf("Cypher: %s\n", format_aes_block128(&cypher).str);
     print_aes_block128_fips_matrix_style(&cypher);
 
+    printf("\n");
+    printf("Next initialization vector: %s\n", format_aes_block128(&next_iv).str);
+    print_aes_block128_fips_matrix_style(&next_iv);
+
     aes256_invert_key_schedule(&key_schedule, &inverted_schedule);
 
     printf("\n");
@@ -50,10 +54,14 @@ int main()
     for (int i = 0; i < 15; ++i)
         printf("\t[%d]: %s\n", i, format_aes_block128(&inverted_schedule.keys[i]).str);
 
-    decrypted = aes256cbc_decrypt(cypher, &inverted_schedule, iv);
+    decrypted = aes256cbc_decrypt(cypher, &inverted_schedule, iv, &next_iv);
     printf("\n");
     printf("Decrypted: %s\n", format_aes_block128(&decrypted).str);
     print_aes_block128_fips_matrix_style(&decrypted);
 
+    printf("\n");
+    printf("Next initialization vector: %s\n", format_aes_block128(&next_iv).str);
+    print_aes_block128_fips_matrix_style(&next_iv);
+
     return 0;
 }
diff --git a/examples/aes256cfb_example.c b/examples/aes256cfb_example.c
index 596f293..35dd21f 100644
--- a/examples/aes256cfb_example.c
+++ b/examples/aes256cfb_example.c
@@ -12,7 +12,7 @@
 
 int main()
 {
-    __declspec(align(16)) AesBlock128 plain, cypher, decrypted, iv;
+    __declspec(align(16)) AesBlock128 plain, cypher, decrypted, iv, next_iv;
     __declspec(align(16)) AesBlock256 key;
     __declspec(align(16)) Aes256KeySchedule key_schedule;
 
@@ -38,15 +38,23 @@ int main()
     for (int i = 0; i < 15; ++i)
         printf("\t[%d]: %s\n", i, format_aes_block128(&key_schedule.keys[i]).str);
 
-    cypher = aes256cfb_encrypt(plain, &key_schedule, iv);
+    cypher = aes256cfb_encrypt(plain, &key_schedule, iv, &next_iv);
     printf("\n");
     printf("Cypher: %s\n", format_aes_block128(&cypher).str);
     print_aes_block128_fips_matrix_style(&cypher);
 
-    decrypted = aes256cfb_decrypt(cypher, &key_schedule, iv);
+    printf("\n");
+    printf("Next initialization vector: %s\n", format_aes_block128(&next_iv).str);
+    print_aes_block128_fips_matrix_style(&next_iv);
+
+    decrypted = aes256cfb_decrypt(cypher, &key_schedule, iv, &next_iv);
     printf("\n");
     printf("Decrypted: %s\n", format_aes_block128(&decrypted).str);
     print_aes_block128_fips_matrix_style(&decrypted);
 
+    printf("\n");
+    printf("Next initialization vector: %s\n", format_aes_block128(&next_iv).str);
+    print_aes_block128_fips_matrix_style(&next_iv);
+
     return 0;
 }
diff --git a/examples/aes256ofb_example.c b/examples/aes256ofb_example.c
index 3481c0c..749103e 100644
--- a/examples/aes256ofb_example.c
+++ b/examples/aes256ofb_example.c
@@ -12,7 +12,7 @@
 
 int main()
 {
-    __declspec(align(16)) AesBlock128 plain, cypher, decrypted, iv;
+    __declspec(align(16)) AesBlock128 plain, cypher, decrypted, iv, next_iv;
     __declspec(align(16)) AesBlock256 key;
     __declspec(align(16)) Aes256KeySchedule key_schedule;
 
@@ -38,15 +38,23 @@ int main()
     for (int i = 0; i < 15; ++i)
         printf("\t[%d]: %s\n", i, format_aes_block128(&key_schedule.keys[i]).str);
 
-    cypher = aes256ofb_encrypt(plain, &key_schedule, iv);
+    cypher = aes256ofb_encrypt(plain, &key_schedule, iv, &next_iv);
     printf("\n");
     printf("Cypher: %s\n", format_aes_block128(&cypher).str);
     print_aes_block128_fips_matrix_style(&cypher);
 
-    decrypted = aes256ofb_decrypt(cypher, &key_schedule, iv);
+    printf("\n");
+    printf("Next initialization vector: %s\n", format_aes_block128(&next_iv).str);
+    print_aes_block128_fips_matrix_style(&next_iv);
+
+    decrypted = aes256ofb_decrypt(cypher, &key_schedule, iv, &next_iv);
     printf("\n");
     printf("Decrypted: %s\n", format_aes_block128(&decrypted).str);
     print_aes_block128_fips_matrix_style(&decrypted);
 
+    printf("\n");
+    printf("Next initialization vector: %s\n", format_aes_block128(&next_iv).str);
+    print_aes_block128_fips_matrix_style(&next_iv);
+
     return 0;
 }