diff options
author | Egor Tensin <Egor.Tensin@gmail.com> | 2015-05-24 16:44:40 +0300 |
---|---|---|
committer | Egor Tensin <Egor.Tensin@gmail.com> | 2015-05-24 16:44:40 +0300 |
commit | 315098f2da4f0d4990b432ad7a932a2918af1dfb (patch) | |
tree | 5400b525c2b02bdb890ec2a9eb643eab6f9549c2 /include/aesni | |
parent | add state-to-block conversion function (diff) | |
download | aes-tools-315098f2da4f0d4990b432ad7a932a2918af1dfb.tar.gz aes-tools-315098f2da4f0d4990b432ad7a932a2918af1dfb.zip |
add block formatting/printing functions
Diffstat (limited to '')
-rw-r--r-- | include/aesni/data.h | 49 | ||||
-rw-r--r-- | include/aesni/raw.h | 64 |
2 files changed, 62 insertions, 51 deletions
diff --git a/include/aesni/data.h b/include/aesni/data.h index d2f6cd5..8819214 100644 --- a/include/aesni/data.h +++ b/include/aesni/data.h @@ -10,33 +10,44 @@ #include <emmintrin.h> -typedef __m128i AesBlock; - -AesBlock make_aes_block(int highest, int high, int low, int lowest); - -typedef AesBlock Aes128Key; +typedef __m128i AesBlock128; typedef struct { - AesBlock hi; - AesBlock lo; + AesBlock128 hi; + AesBlock128 lo; } -Aes192Key; +AesBlock192; typedef struct { - AesBlock hi; - AesBlock lo; + AesBlock128 hi; + AesBlock128 lo; } -Aes256Key; +AesBlock256; -typedef struct -{ - unsigned char bytes[4][4]; -} -AesState; +AesBlock128 make_aes_block128(int hi3, int hi2, int lo1, int lo0); +AesBlock192 make_aes_block192(int hi5, int hi4, int lo3, int lo2, int lo1, int lo0); +AesBlock256 make_aes_block256(int hi7, int hi6, int hi5, int hi4, int lo3, int lo2, int lo1, int lo0); + +typedef struct { char str[33]; } AesBlockString128; +typedef struct { char str[49]; } AesBlockString192; +typedef struct { char str[65]; } AesBlockString256; + +AesBlockString128 format_aes_block128(AesBlock128*); +AesBlockString192 format_aes_block192(AesBlock192*); +AesBlockString256 format_aes_block256(AesBlock256*); + +AesBlockString128 format_aes_block128_fips_style(AesBlock128*); +AesBlockString192 format_aes_block192_fips_style(AesBlock192*); +AesBlockString256 format_aes_block256_fips_style(AesBlock256*); + +void print_aes_block128(AesBlock128*); +void print_aes_block192(AesBlock192*); +void print_aes_block256(AesBlock256*); -AesState aes_block_to_state(AesBlock); -AesBlock aes_state_to_block(AesState); +void print_aes_block128_fips_style(AesBlock128*); +void print_aes_block192_fips_style(AesBlock192*); +void print_aes_block256_fips_style(AesBlock256*); -void print_aes_block(AesBlock); +void print_aes_block128_fips_matrix_style(AesBlock128*); diff --git a/include/aesni/raw.h b/include/aesni/raw.h index 03ce217..9ee6ae9 100644 --- a/include/aesni/raw.h +++ b/include/aesni/raw.h @@ -10,38 +10,38 @@ #include "data.h" -AesBlock __fastcall aes128ecb_encrypt( - AesBlock plain, - AesBlock key); -AesBlock __fastcall aes128ecb_decrypt( - AesBlock cypher, - AesBlock key); +AesBlock128 __fastcall aes128ecb_encrypt( + AesBlock128 plain, + AesBlock128 key); +AesBlock128 __fastcall aes128ecb_decrypt( + AesBlock128 cypher, + AesBlock128 key); -AesBlock __fastcall aes192ecb_encrypt( - AesBlock plain, - AesBlock key_lo, - AesBlock key_hi); -AesBlock __fastcall aes192ecb_decrypt( - AesBlock cypher, - AesBlock key_lo, - AesBlock key_hi); +AesBlock128 __fastcall aes192ecb_encrypt( + AesBlock128 plain, + AesBlock128 key_lo, + AesBlock128 key_hi); +AesBlock128 __fastcall aes192ecb_decrypt( + AesBlock128 cypher, + AesBlock128 key_lo, + AesBlock128 key_hi); -AesBlock __fastcall aes256ecb_encrypt( - AesBlock plain, - AesBlock key_lo, - AesBlock key_hi); -AesBlock __fastcall aes256ecb_decrypt( - AesBlock cypher, - AesBlock key_lo, - AesBlock key_hi); +AesBlock128 __fastcall aes256ecb_encrypt( + AesBlock128 plain, + AesBlock128 key_lo, + AesBlock128 key_hi); +AesBlock128 __fastcall aes256ecb_decrypt( + AesBlock128 cypher, + AesBlock128 key_lo, + AesBlock128 key_hi); -AesBlock __fastcall aes256cbc_encrypt( - AesBlock plain, - AesBlock key_lo, - AesBlock key_hi, - AesBlock *iv); -AesBlock __fastcall aes256cbc_decrypt( - AesBlock cypher, - AesBlock key_lo, - AesBlock key_hi, - AesBlock *iv); +AesBlock128 __fastcall aes256cbc_encrypt( + AesBlock128 plain, + AesBlock128 key_lo, + AesBlock128 key_hi, + AesBlock128 *iv); +AesBlock128 __fastcall aes256cbc_decrypt( + AesBlock128 cypher, + AesBlock128 key_lo, + AesBlock128 key_hi, + AesBlock128 *iv); |