diff options
author | Egor Tensin <Egor.Tensin@gmail.com> | 2015-06-03 21:40:58 +0300 |
---|---|---|
committer | Egor Tensin <Egor.Tensin@gmail.com> | 2015-06-03 21:40:58 +0300 |
commit | b115137c931de423bd4a22381dbd764080f9fc74 (patch) | |
tree | e164be24331f1cd8e3ee59e9de4e5b23ee6ae387 /examples | |
parent | add CFB mode (diff) | |
download | aes-tools-b115137c931de423bd4a22381dbd764080f9fc74.tar.gz aes-tools-b115137c931de423bd4a22381dbd764080f9fc74.zip |
examples: no more FIPS-style one-line blocks
Diffstat (limited to 'examples')
-rw-r--r-- | examples/aes128cbc_example.c | 11 | ||||
-rw-r--r-- | examples/aes128cfb_example.c | 8 | ||||
-rw-r--r-- | examples/aes128ecb_example.c | 10 | ||||
-rw-r--r-- | examples/aes192cbc_example.c | 11 | ||||
-rw-r--r-- | examples/aes192cfb_example.c | 8 | ||||
-rw-r--r-- | examples/aes192ecb_example.c | 10 | ||||
-rw-r--r-- | examples/aes256cbc_example.c | 11 | ||||
-rw-r--r-- | examples/aes256cfb_example.c | 8 | ||||
-rw-r--r-- | examples/aes256ecb_example.c | 10 |
9 files changed, 0 insertions, 87 deletions
diff --git a/examples/aes128cbc_example.c b/examples/aes128cbc_example.c index cb5684e..53156c4 100644 --- a/examples/aes128cbc_example.c +++ b/examples/aes128cbc_example.c @@ -20,17 +20,14 @@ int main() iv = make_aes_block128(0xfedcba98, 0x76543210, 0xfedcba98, 0x76543210); 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("\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("\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); aes128_expand_key_schedule(key, &key_schedule); @@ -38,15 +35,11 @@ int main() printf("\n"); printf("Key schedule:\n"); for (int i = 0; i < 11; ++i) - { printf("\t[%d]: %s\n", i, format_aes_block128(&key_schedule.keys[i]).str); - printf("\t[%d]: %s\n", i, format_aes_block128_fips_style(&key_schedule.keys[i]).str); - } cypher = aes128cbc_encrypt(plain, &key_schedule, iv); 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); aes128_invert_key_schedule(&key_schedule, &inverted_schedule); @@ -54,15 +47,11 @@ int main() printf("\n"); printf("Inverted key schedule:\n"); for (int i = 0; i < 11; ++i) - { printf("\t[%d]: %s\n", i, format_aes_block128(&inverted_schedule.keys[i]).str); - printf("\t[%d]: %s\n", i, format_aes_block128_fips_style(&inverted_schedule.keys[i]).str); - } decrypted = aes128cbc_decrypt(cypher, &inverted_schedule, iv); 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/aes128cfb_example.c b/examples/aes128cfb_example.c index 904c1bd..c466c11 100644 --- a/examples/aes128cfb_example.c +++ b/examples/aes128cfb_example.c @@ -20,17 +20,14 @@ int main() iv = make_aes_block128(0xfedcba98, 0x76543210, 0xfedcba98, 0x76543210); 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("\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("\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); aes128_expand_key_schedule(key, &key_schedule); @@ -38,21 +35,16 @@ int main() printf("\n"); printf("Key schedule:\n"); for (int i = 0; i < 11; ++i) - { printf("\t[%d]: %s\n", i, format_aes_block128(&key_schedule.keys[i]).str); - printf("\t[%d]: %s\n", i, format_aes_block128_fips_style(&key_schedule.keys[i]).str); - } cypher = aes128cfb_encrypt(plain, &key_schedule, iv); 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); decrypted = aes128cfb_decrypt(cypher, &key_schedule, iv); 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/aes128ecb_example.c b/examples/aes128ecb_example.c index 3372540..78b7e5f 100644 --- a/examples/aes128ecb_example.c +++ b/examples/aes128ecb_example.c @@ -19,12 +19,10 @@ int main() key = make_aes_block128(0x0f0e0d0c, 0x0b0a0908, 0x07060504, 0x03020100); 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("\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); aes128_expand_key_schedule(key, &key_schedule); @@ -32,15 +30,11 @@ int main() printf("\n"); printf("Key schedule:\n"); for (int i = 0; i < 11; ++i) - { printf("\t[%d]: %s\n", i, format_aes_block128(&key_schedule.keys[i]).str); - printf("\t[%d]: %s\n", i, format_aes_block128_fips_style(&key_schedule.keys[i]).str); - } cypher = aes128ecb_encrypt(plain, &key_schedule); 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); aes128_invert_key_schedule(&key_schedule, &inverted_schedule); @@ -48,15 +42,11 @@ int main() printf("\n"); printf("Inverted key schedule:\n"); for (int i = 0; i < 11; ++i) - { printf("\t[%d]: %s\n", i, format_aes_block128(&inverted_schedule.keys[i]).str); - printf("\t[%d]: %s\n", i, format_aes_block128_fips_style(&inverted_schedule.keys[i]).str); - } decrypted = aes128ecb_decrypt(cypher, &inverted_schedule); 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/aes192cbc_example.c b/examples/aes192cbc_example.c index 1edff77..dc6d478 100644 --- a/examples/aes192cbc_example.c +++ b/examples/aes192cbc_example.c @@ -21,17 +21,14 @@ int main() iv = make_aes_block128(0xfedcba98, 0x76543210, 0xfedcba98, 0x76543210); 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("\n"); printf("Key: %s\n", format_aes_block192(&key).str); - printf(" %s\n", format_aes_block192_fips_style(&key).str); print_aes_block192_fips_matrix_style(&key); 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); aes192_expand_key_schedule(&key, &key_schedule); @@ -39,15 +36,11 @@ int main() printf("\n"); printf("Key schedule:\n"); for (int i = 0; i < 13; ++i) - { printf("\t[%d]: %s\n", i, format_aes_block128(&key_schedule.keys[i]).str); - printf("\t[%d]: %s\n", i, format_aes_block128_fips_style(&key_schedule.keys[i]).str); - } cypher = aes192cbc_encrypt(plain, &key_schedule, iv); 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); aes192_invert_key_schedule(&key_schedule, &inverted_schedule); @@ -55,15 +48,11 @@ int main() printf("\n"); printf("Inverted key schedule:\n"); for (int i = 0; i < 13; ++i) - { printf("\t[%d]: %s\n", i, format_aes_block128(&inverted_schedule.keys[i]).str); - printf("\t[%d]: %s\n", i, format_aes_block128_fips_style(&inverted_schedule.keys[i]).str); - } decrypted = aes192cbc_decrypt(cypher, &inverted_schedule, iv); 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/aes192cfb_example.c b/examples/aes192cfb_example.c index b0f5b00..fe6340b 100644 --- a/examples/aes192cfb_example.c +++ b/examples/aes192cfb_example.c @@ -21,17 +21,14 @@ int main() iv = make_aes_block128(0xfedcba98, 0x76543210, 0xfedcba98, 0x76543210); 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("\n"); printf("Key: %s\n", format_aes_block192(&key).str); - printf(" %s\n", format_aes_block192_fips_style(&key).str); print_aes_block192_fips_matrix_style(&key); 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); aes192_expand_key_schedule(&key, &key_schedule); @@ -39,21 +36,16 @@ int main() printf("\n"); printf("Key schedule:\n"); for (int i = 0; i < 13; ++i) - { printf("\t[%d]: %s\n", i, format_aes_block128(&key_schedule.keys[i]).str); - printf("\t[%d]: %s\n", i, format_aes_block128_fips_style(&key_schedule.keys[i]).str); - } cypher = aes192cfb_encrypt(plain, &key_schedule, iv); 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); decrypted = aes192cfb_decrypt(cypher, &key_schedule, iv); 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/aes192ecb_example.c b/examples/aes192ecb_example.c index eb3b329..e0d435b 100644 --- a/examples/aes192ecb_example.c +++ b/examples/aes192ecb_example.c @@ -20,12 +20,10 @@ int main() key = make_aes_block192(0x17161514, 0x13121110, 0x0f0e0d0c, 0x0b0a0908, 0x07060504, 0x03020100); 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("\n"); printf("Key: %s\n", format_aes_block192(&key).str); - printf(" %s\n", format_aes_block192_fips_style(&key).str); print_aes_block192_fips_matrix_style(&key); aes192_expand_key_schedule(&key, &key_schedule); @@ -33,15 +31,11 @@ int main() printf("\n"); printf("Key schedule:\n"); for (int i = 0; i < 13; ++i) - { printf("\t[%d]: %s\n", i, format_aes_block128(&key_schedule.keys[i]).str); - printf("\t[%d]: %s\n", i, format_aes_block128_fips_style(&key_schedule.keys[i]).str); - } cypher = aes192ecb_encrypt(plain, &key_schedule); 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); aes192_invert_key_schedule(&key_schedule, &inverted_schedule); @@ -49,15 +43,11 @@ int main() printf("\n"); printf("Inverted key schedule:\n"); for (int i = 0; i < 13; ++i) - { printf("\t[%d]: %s\n", i, format_aes_block128(&inverted_schedule.keys[i]).str); - printf("\t[%d]: %s\n", i, format_aes_block128_fips_style(&inverted_schedule.keys[i]).str); - } decrypted = aes192ecb_decrypt(cypher, &inverted_schedule); 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 bfd88fb..423cd5d 100644 --- a/examples/aes256cbc_example.c +++ b/examples/aes256cbc_example.c @@ -21,17 +21,14 @@ int main() iv = make_aes_block128(0xfedcba98, 0x76543210, 0xfedcba98, 0x76543210); 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("\n"); printf("Key: %s\n", format_aes_block256(&key).str); - printf(" %s\n", format_aes_block256_fips_style(&key).str); print_aes_block256_fips_matrix_style(&key); 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); aes256_expand_key_schedule(&key, &key_schedule); @@ -39,15 +36,11 @@ int main() printf("\n"); printf("Key schedule:\n"); for (int i = 0; i < 15; ++i) - { printf("\t[%d]: %s\n", i, format_aes_block128(&key_schedule.keys[i]).str); - printf("\t[%d]: %s\n", i, format_aes_block128_fips_style(&key_schedule.keys[i]).str); - } cypher = aes256cbc_encrypt(plain, &key_schedule, iv); 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); aes256_invert_key_schedule(&key_schedule, &inverted_schedule); @@ -55,15 +48,11 @@ int main() printf("\n"); printf("Inverted key schedule:\n"); for (int i = 0; i < 15; ++i) - { printf("\t[%d]: %s\n", i, format_aes_block128(&inverted_schedule.keys[i]).str); - printf("\t[%d]: %s\n", i, format_aes_block128_fips_style(&inverted_schedule.keys[i]).str); - } decrypted = aes256cbc_decrypt(cypher, &inverted_schedule, iv); 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/aes256cfb_example.c b/examples/aes256cfb_example.c index 69234c1..596f293 100644 --- a/examples/aes256cfb_example.c +++ b/examples/aes256cfb_example.c @@ -21,17 +21,14 @@ int main() iv = make_aes_block128(0xfedcba98, 0x76543210, 0xfedcba98, 0x76543210); 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("\n"); printf("Key: %s\n", format_aes_block256(&key).str); - printf(" %s\n", format_aes_block256_fips_style(&key).str); print_aes_block256_fips_matrix_style(&key); 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); aes256_expand_key_schedule(&key, &key_schedule); @@ -39,21 +36,16 @@ int main() printf("\n"); printf("Key schedule:\n"); for (int i = 0; i < 15; ++i) - { printf("\t[%d]: %s\n", i, format_aes_block128(&key_schedule.keys[i]).str); - printf("\t[%d]: %s\n", i, format_aes_block128_fips_style(&key_schedule.keys[i]).str); - } cypher = aes256cfb_encrypt(plain, &key_schedule, iv); 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); decrypted = aes256cfb_decrypt(cypher, &key_schedule, iv); 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 cd36b50..37366a3 100644 --- a/examples/aes256ecb_example.c +++ b/examples/aes256ecb_example.c @@ -20,12 +20,10 @@ int main() key = make_aes_block256(0x1f1e1d1c, 0x1b1a1918, 0x17161514, 0x13121110, 0x0f0e0d0c, 0x0b0a0908, 0x07060504, 0x03020100); 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("\n"); printf("Key: %s\n", format_aes_block256(&key).str); - printf(" %s\n", format_aes_block256_fips_style(&key).str); print_aes_block256_fips_matrix_style(&key); aes256_expand_key_schedule(&key, &key_schedule); @@ -33,15 +31,11 @@ int main() printf("\n"); printf("Key schedule:\n"); for (int i = 0; i < 15; ++i) - { printf("\t[%d]: %s\n", i, format_aes_block128(&key_schedule.keys[i]).str); - printf("\t[%d]: %s\n", i, format_aes_block128_fips_style(&key_schedule.keys[i]).str); - } cypher = aes256ecb_encrypt(plain, &key_schedule); 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); aes256_invert_key_schedule(&key_schedule, &inverted_schedule); @@ -49,15 +43,11 @@ int main() printf("\n"); printf("Inverted key schedule:\n"); for (int i = 0; i < 15; ++i) - { printf("\t[%d]: %s\n", i, format_aes_block128(&inverted_schedule.keys[i]).str); - printf("\t[%d]: %s\n", i, format_aes_block128_fips_style(&inverted_schedule.keys[i]).str); - } decrypted = aes256ecb_decrypt(cypher, &inverted_schedule); 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; |