From f4eb1f376a8dad10daf8ba4acf0a2095169af179 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sun, 24 May 2015 17:35:31 +0300 Subject: add higher-level encrypt/decrypt functions --- examples/aes192_example.c | 21 +++++++-------------- examples/aes256cbc_example.c | 25 +++++++++---------------- examples/aes256ecb_example.c | 21 +++++++-------------- 3 files changed, 23 insertions(+), 44 deletions(-) (limited to 'examples') diff --git a/examples/aes192_example.c b/examples/aes192_example.c index a310ab2..c936ab7 100644 --- a/examples/aes192_example.c +++ b/examples/aes192_example.c @@ -13,33 +13,26 @@ int main() { __declspec(align(16)) AesBlock128 plain, cypher, decrypted; - __declspec(align(16)) AesBlock128 key_low, key_high; + __declspec(align(16)) AesBlock192 key; - 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); + plain = make_aes_block128(0xffeeddcc, 0xbbaa9988, 0x77665544, 0x33221100); + 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 (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("Key: %s\n", format_aes_block192(&key).str); + printf(" %s\n", format_aes_block192_fips_style(&key).str); - 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); - - cypher = aes192ecb_encrypt(plain, key_low, key_high); + cypher = aes192ecb_encrypt(plain, &key); 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 = aes192ecb_decrypt(cypher, key_low, key_high); + decrypted = aes192ecb_decrypt(cypher, &key); printf("\n"); printf("Decrypted: %s\n", format_aes_block128(&decrypted).str); printf(" %s\n", format_aes_block128_fips_style(&decrypted).str); diff --git a/examples/aes256cbc_example.c b/examples/aes256cbc_example.c index 2847f41..4ce50d9 100644 --- a/examples/aes256cbc_example.c +++ b/examples/aes256cbc_example.c @@ -12,40 +12,33 @@ int main() { - __declspec(align(16)) AesBlock128 plain, cypher, decrypted; - __declspec(align(16)) AesBlock128 key_low, key_high, iv; + __declspec(align(16)) AesBlock128 plain, cypher, decrypted, iv; + __declspec(align(16)) AesBlock256 key; - 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); + plain = make_aes_block128(0xffeeddcc, 0xbbaa9988, 0x77665544, 0x33221100); + key = make_aes_block256(0x1f1e1d1c, 0x1b1a1918, 0x17161514, 0x13121110, 0x0f0e0d0c, 0x0b0a0908, 0x07060504, 0x03020100); + 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 (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("Key: %s\n", format_aes_block256(&key).str); + printf(" %s\n", format_aes_block256_fips_style(&key).str); 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); - cypher = aes256cbc_encrypt(plain, key_low, key_high, &iv); + cypher = aes256cbc_encrypt(plain, &key, &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 = aes256cbc_decrypt(cypher, key_low, key_high, &iv); + decrypted = aes256cbc_decrypt(cypher, &key, &iv); printf("\n"); printf("Decrypted: %s\n", format_aes_block128(&decrypted).str); printf(" %s\n", format_aes_block128_fips_style(&decrypted).str); diff --git a/examples/aes256ecb_example.c b/examples/aes256ecb_example.c index c15082d..fe7f9b9 100644 --- a/examples/aes256ecb_example.c +++ b/examples/aes256ecb_example.c @@ -13,33 +13,26 @@ int main() { __declspec(align(16)) AesBlock128 plain, cypher, decrypted; - __declspec(align(16)) AesBlock128 key_low, key_high; + __declspec(align(16)) AesBlock256 key; - 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); + plain = make_aes_block128(0xffeeddcc, 0xbbaa9988, 0x77665544, 0x33221100); + 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 (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("Key: %s\n", format_aes_block256(&key).str); + printf(" %s\n", format_aes_block256_fips_style(&key).str); - 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); - - cypher = aes256ecb_encrypt(plain, key_low, key_high); + cypher = aes256ecb_encrypt(plain, &key); 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 = aes256ecb_decrypt(cypher, key_low, key_high); + decrypted = aes256ecb_decrypt(cypher, &key); printf("\n"); printf("Decrypted: %s\n", format_aes_block128(&decrypted).str); printf(" %s\n", format_aes_block128_fips_style(&decrypted).str); -- cgit v1.2.3