diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2015-05-29 23:01:36 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2015-05-29 23:01:36 +0300 |
| commit | 22eb69c05cd574bfa505ea45f40a18e5b05893c1 (patch) | |
| tree | a390df6f49fcbf38f7ebdb17e74d1010cf3eb355 /src/aes256ecb.asm | |
| parent | aes256ecb.asm: better comments (as in aes192.asm) (diff) | |
| download | aes-tools-22eb69c05cd574bfa505ea45f40a18e5b05893c1.tar.gz aes-tools-22eb69c05cd574bfa505ea45f40a18e5b05893c1.zip | |
merge aes256{ecb,cbc}.asm
Diffstat (limited to '')
| -rw-r--r-- | src/aes256.asm (renamed from src/aes256ecb.asm) | 57 |
1 files changed, 34 insertions, 23 deletions
diff --git a/src/aes256ecb.asm b/src/aes256.asm index 68430a1..56dbd05 100644 --- a/src/aes256ecb.asm +++ b/src/aes256.asm @@ -17,7 +17,7 @@ inverse_key_schedule oword 15 dup(0) .code @raw_aes256ecb_encrypt@48 proc - call expand_keys_256ecb + call expand_keys256 pxor xmm0, [key_schedule] aesenc xmm0, [key_schedule + 10h] aesenc xmm0, [key_schedule + 20h] @@ -36,7 +36,38 @@ inverse_key_schedule oword 15 dup(0) ret @raw_aes256ecb_encrypt@48 endp -expand_keys_256ecb proc +@raw_aes256cbc_encrypt@52 proc + pxor xmm0, [ecx] + jmp @raw_aes256ecb_encrypt@48 +@raw_aes256cbc_encrypt@52 endp + +@raw_aes256ecb_decrypt@48 proc + call expand_keys256 + pxor xmm0, [inverse_key_schedule] + aesdec xmm0, [inverse_key_schedule + 10h] + aesdec xmm0, [inverse_key_schedule + 20h] + aesdec xmm0, [inverse_key_schedule + 30h] + aesdec xmm0, [inverse_key_schedule + 40h] + aesdec xmm0, [inverse_key_schedule + 50h] + aesdec xmm0, [inverse_key_schedule + 60h] + aesdec xmm0, [inverse_key_schedule + 70h] + aesdec xmm0, [inverse_key_schedule + 80h] + aesdec xmm0, [inverse_key_schedule + 90h] + aesdec xmm0, [inverse_key_schedule + 0A0h] + aesdec xmm0, [inverse_key_schedule + 0B0h] + aesdec xmm0, [inverse_key_schedule + 0C0h] + aesdec xmm0, [inverse_key_schedule + 0D0h] + aesdeclast xmm0, [inverse_key_schedule + 0E0h] + ret +@raw_aes256ecb_decrypt@48 endp + +@raw_aes256cbc_decrypt@52 proc + call @raw_aes256ecb_decrypt@48 + pxor xmm0, [ecx] + ret +@raw_aes256cbc_decrypt@52 endp + +expand_keys256 proc ; A "word" (in terms of the FIPS 187 standard) is a 32-bit block. ; Words are denoted by `w[N]`. ; @@ -273,26 +304,6 @@ invert_key_schedule: movdqa [inverse_key_schedule + 70h], xmm7 ret -expand_keys_256ecb endp - -@raw_aes256ecb_decrypt@48 proc - call expand_keys_256ecb - pxor xmm0, [inverse_key_schedule] - aesdec xmm0, [inverse_key_schedule + 10h] - aesdec xmm0, [inverse_key_schedule + 20h] - aesdec xmm0, [inverse_key_schedule + 30h] - aesdec xmm0, [inverse_key_schedule + 40h] - aesdec xmm0, [inverse_key_schedule + 50h] - aesdec xmm0, [inverse_key_schedule + 60h] - aesdec xmm0, [inverse_key_schedule + 70h] - aesdec xmm0, [inverse_key_schedule + 80h] - aesdec xmm0, [inverse_key_schedule + 90h] - aesdec xmm0, [inverse_key_schedule + 0A0h] - aesdec xmm0, [inverse_key_schedule + 0B0h] - aesdec xmm0, [inverse_key_schedule + 0C0h] - aesdec xmm0, [inverse_key_schedule + 0D0h] - aesdeclast xmm0, [inverse_key_schedule + 0E0h] - ret -@raw_aes256ecb_decrypt@48 endp +expand_keys256 endp end |