aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2015-05-24 17:35:31 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2015-05-24 17:35:31 +0300
commitf4eb1f376a8dad10daf8ba4acf0a2095169af179 (patch)
treee9b5c36726d3e55b612c84d8d777d1f80b2b6993 /src
parentbugfix (diff)
downloadaes-tools-f4eb1f376a8dad10daf8ba4acf0a2095169af179.tar.gz
aes-tools-f4eb1f376a8dad10daf8ba4acf0a2095169af179.zip
add higher-level encrypt/decrypt functions
Diffstat (limited to 'src')
-rw-r--r--src/aes128.asm8
-rw-r--r--src/aes192.asm10
-rw-r--r--src/aes256cbc.asm10
-rw-r--r--src/aes256ecb.asm10
4 files changed, 19 insertions, 19 deletions
diff --git a/src/aes128.asm b/src/aes128.asm
index dfa7a7d..b375daf 100644
--- a/src/aes128.asm
+++ b/src/aes128.asm
@@ -16,7 +16,7 @@ inverted_key_schedule oword 11 dup(0)
.code
-@aes128ecb_encrypt@32 proc
+@raw_aes128ecb_encrypt@32 proc
call expand_keys_128ecb
pxor xmm0, [key_schedule]
aesenc xmm0, [key_schedule + 10h]
@@ -30,9 +30,9 @@ inverted_key_schedule oword 11 dup(0)
aesenc xmm0, [key_schedule + 90h]
aesenclast xmm0, [key_schedule + 0A0h]
ret
-@aes128ecb_encrypt@32 endp
+@raw_aes128ecb_encrypt@32 endp
-@aes128ecb_decrypt@32 proc
+@raw_aes128ecb_decrypt@32 proc
call expand_keys_128ecb
pxor xmm0, [inverted_key_schedule]
aesdec xmm0, [inverted_key_schedule + 10h]
@@ -46,7 +46,7 @@ inverted_key_schedule oword 11 dup(0)
aesdec xmm0, [inverted_key_schedule + 90h]
aesdeclast xmm0, [inverted_key_schedule + 0A0h]
ret
-@aes128ecb_decrypt@32 endp
+@raw_aes128ecb_decrypt@32 endp
expand_keys_128ecb proc
lea ecx, [key_schedule + 10h]
diff --git a/src/aes192.asm b/src/aes192.asm
index fd92426..9695961 100644
--- a/src/aes192.asm
+++ b/src/aes192.asm
@@ -16,7 +16,7 @@ inverted_key_schedule oword 13 dup(0)
.code
-@aes192ecb_encrypt@48 proc
+@raw_aes192ecb_encrypt@48 proc
call expand_keys_192ecb
pxor xmm0, [key_schedule]
aesenc xmm0, [key_schedule + 10h]
@@ -32,9 +32,9 @@ inverted_key_schedule oword 13 dup(0)
aesenc xmm0, [key_schedule + 0B0h]
aesenclast xmm0, [key_schedule + 0C0h]
ret
-@aes192ecb_encrypt@48 endp
+@raw_aes192ecb_encrypt@48 endp
-@aes192ecb_decrypt@48 proc
+@raw_aes192ecb_decrypt@48 proc
call expand_keys_192ecb
pxor xmm0, [inverted_key_schedule]
aesdec xmm0, [inverted_key_schedule + 10h]
@@ -50,7 +50,7 @@ inverted_key_schedule oword 13 dup(0)
aesdec xmm0, [inverted_key_schedule + 0B0h]
aesdeclast xmm0, [inverted_key_schedule + 0C0h]
ret
-@aes192ecb_decrypt@48 endp
+@raw_aes192ecb_decrypt@48 endp
expand_keys_192ecb proc
; key = k0 k1 k2 k3 k4 k5
@@ -189,7 +189,7 @@ invert_key_schedule:
aesimc xmm7, [key_schedule + 60h]
movdqa [inverted_key_schedule + 60h], xmm7
-
+
ret
expand_keys_192ecb endp
diff --git a/src/aes256cbc.asm b/src/aes256cbc.asm
index 3446d31..1a5c8f0 100644
--- a/src/aes256cbc.asm
+++ b/src/aes256cbc.asm
@@ -16,7 +16,7 @@ inverse_key_schedule oword 15 dup(0)
.code
-@aes256cbc_encrypt@52 proc
+@raw_aes256cbc_encrypt@52 proc
call expand_keys_256cbc
pxor xmm0, [ecx]
pxor xmm0, [key_schedule]
@@ -35,7 +35,7 @@ inverse_key_schedule oword 15 dup(0)
aesenc xmm0, [key_schedule + 0D0h]
aesenclast xmm0, [key_schedule + 0E0h]
ret
-@aes256cbc_encrypt@52 endp
+@raw_aes256cbc_encrypt@52 endp
expand_keys_256cbc proc
lea edx, [key_schedule + 20h]
@@ -159,7 +159,7 @@ invert_key_schedule:
ret
expand_keys_256cbc endp
-@aes256cbc_decrypt@52 proc
+@raw_aes256cbc_decrypt@52 proc
call expand_keys_256cbc
pxor xmm0, [inverse_key_schedule]
aesdec xmm0, [inverse_key_schedule + 10h]
@@ -175,9 +175,9 @@ expand_keys_256cbc endp
aesdec xmm0, [inverse_key_schedule + 0B0h]
aesdec xmm0, [inverse_key_schedule + 0C0h]
aesdec xmm0, [inverse_key_schedule + 0D0h]
- aesdeclast xmm0, [inverse_key_schedule + 0E0h]
+ aesdeclast xmm0, [inverse_key_schedule + 0E0h]
pxor xmm0, [ecx]
ret
-@aes256cbc_decrypt@52 endp
+@raw_aes256cbc_decrypt@52 endp
end
diff --git a/src/aes256ecb.asm b/src/aes256ecb.asm
index 4246dee..f67f4bd 100644
--- a/src/aes256ecb.asm
+++ b/src/aes256ecb.asm
@@ -16,7 +16,7 @@ inverse_key_schedule oword 15 dup(0)
.code
-@aes256ecb_encrypt@48 proc
+@raw_aes256ecb_encrypt@48 proc
call expand_keys_256ecb
pxor xmm0, [key_schedule]
aesenc xmm0, [key_schedule + 10h]
@@ -34,7 +34,7 @@ inverse_key_schedule oword 15 dup(0)
aesenc xmm0, [key_schedule + 0D0h]
aesenclast xmm0, [key_schedule + 0E0h]
ret
-@aes256ecb_encrypt@48 endp
+@raw_aes256ecb_encrypt@48 endp
expand_keys_256ecb proc
lea edx, [key_schedule + 20h]
@@ -158,7 +158,7 @@ invert_key_schedule:
ret
expand_keys_256ecb endp
-@aes256ecb_decrypt@48 proc
+@raw_aes256ecb_decrypt@48 proc
call expand_keys_256ecb
pxor xmm0, [inverse_key_schedule]
aesdec xmm0, [inverse_key_schedule + 10h]
@@ -174,8 +174,8 @@ expand_keys_256ecb endp
aesdec xmm0, [inverse_key_schedule + 0B0h]
aesdec xmm0, [inverse_key_schedule + 0C0h]
aesdec xmm0, [inverse_key_schedule + 0D0h]
- aesdeclast xmm0, [inverse_key_schedule + 0E0h]
+ aesdeclast xmm0, [inverse_key_schedule + 0E0h]
ret
-@aes256ecb_decrypt@48 endp
+@raw_aes256ecb_decrypt@48 endp
end