aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/asm
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2015-06-17 18:29:40 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2015-06-17 18:29:40 +0300
commit0651133db30c0932877780c2f98901e4ca1072e1 (patch)
tree2b87823b4b9f4b5a75affa4b1606abb06a598c97 /src/asm
parentfactor out 128-bit XORing (diff)
downloadaes-tools-0651133db30c0932877780c2f98901e4ca1072e1.tar.gz
aes-tools-0651133db30c0932877780c2f98901e4ca1072e1.zip
refactoring
Diffstat (limited to 'src/asm')
-rw-r--r--src/asm/aes128.asm16
-rw-r--r--src/asm/aes192.asm16
-rw-r--r--src/asm/aes256.asm16
3 files changed, 24 insertions, 24 deletions
diff --git a/src/asm/aes128.asm b/src/asm/aes128.asm
index 4f88f09..03a9ace 100644
--- a/src/asm/aes128.asm
+++ b/src/asm/aes128.asm
@@ -8,7 +8,7 @@
.code
-@aesni_raw_encrypt_block128@20 proc
+@aesni_aes128_encrypt_block_@20 proc
pxor xmm0, [ecx]
aesenc xmm0, [ecx + 10h]
aesenc xmm0, [ecx + 20h]
@@ -21,9 +21,9 @@
aesenc xmm0, [ecx + 90h]
aesenclast xmm0, [ecx + 0A0h]
ret
-@aesni_raw_encrypt_block128@20 endp
+@aesni_aes128_encrypt_block_@20 endp
-@aesni_raw_decrypt_block128@20 proc
+@aesni_aes128_decrypt_block_@20 proc
pxor xmm0, [ecx]
aesdec xmm0, [ecx + 10h]
aesdec xmm0, [ecx + 20h]
@@ -36,9 +36,9 @@
aesdec xmm0, [ecx + 90h]
aesdeclast xmm0, [ecx + 0A0h]
ret
-@aesni_raw_decrypt_block128@20 endp
+@aesni_aes128_decrypt_block_@20 endp
-@aesni_raw_expand_key_schedule128@20 proc
+@aesni_aes128_expand_key_@20 proc
; A "word" (in terms of the FIPS 187 standard) is a 32-bit block.
; Words are denoted by `w[N]`.
;
@@ -165,9 +165,9 @@ aes128_keygen_assist:
add ecx, 10h ; ecx = &w[i+8]
ret
-@aesni_raw_expand_key_schedule128@20 endp
+@aesni_aes128_expand_key_@20 endp
-@aesni_raw_invert_key_schedule128@8 proc
+@aesni_aes128_derive_decryption_keys_raw@8 proc
movdqa xmm5, [ecx]
movdqa xmm4, [ecx + 0A0h]
movdqa [edx], xmm4
@@ -197,6 +197,6 @@ aes128_keygen_assist:
movdqa [edx + 50h], xmm5
ret
-@aesni_raw_invert_key_schedule128@8 endp
+@aesni_aes128_derive_decryption_keys_raw@8 endp
end
diff --git a/src/asm/aes192.asm b/src/asm/aes192.asm
index e045910..cd28143 100644
--- a/src/asm/aes192.asm
+++ b/src/asm/aes192.asm
@@ -8,7 +8,7 @@
.code
-@aesni_raw_encrypt_block192@20 proc
+@aesni_aes192_encrypt_block_@20 proc
pxor xmm0, [ecx]
aesenc xmm0, [ecx + 10h]
aesenc xmm0, [ecx + 20h]
@@ -23,9 +23,9 @@
aesenc xmm0, [ecx + 0B0h]
aesenclast xmm0, [ecx + 0C0h]
ret
-@aesni_raw_encrypt_block192@20 endp
+@aesni_aes192_encrypt_block_@20 endp
-@aesni_raw_decrypt_block192@20 proc
+@aesni_aes192_decrypt_block_@20 proc
pxor xmm0, [ecx]
aesdec xmm0, [ecx + 10h]
aesdec xmm0, [ecx + 20h]
@@ -40,9 +40,9 @@
aesdec xmm0, [ecx + 0B0h]
aesdeclast xmm0, [ecx + 0C0h]
ret
-@aesni_raw_decrypt_block192@20 endp
+@aesni_aes192_decrypt_block_@20 endp
-@aesni_raw_expand_key_schedule192@36 proc
+@aesni_aes192_expand_key_@36 proc
; A "word" (in terms of the FIPS 187 standard) is a 32-bit block.
; Words are denoted by `w[N]`.
;
@@ -206,9 +206,9 @@ aes192_keygen_assist:
; xmm1[31:0] == w[i+10] == RotWord(SubWord(w[i+5]))^Rcon^w[i+4]^w[i+3]^w[i+2]^w[i+1]^w[i]
ret
-@aesni_raw_expand_key_schedule192@36 endp
+@aesni_aes192_expand_key_@36 endp
-@aesni_raw_invert_key_schedule192@8 proc
+@aesni_aes192_derive_decryption_keys_@8 proc
movdqa xmm5, [ecx]
movdqa xmm4, [ecx + 0C0h]
movdqa [edx], xmm4
@@ -243,6 +243,6 @@ aes192_keygen_assist:
movdqa [edx + 60h], xmm5
ret
-@aesni_raw_invert_key_schedule192@8 endp
+@aesni_aes192_derive_decryption_keys_@8 endp
end
diff --git a/src/asm/aes256.asm b/src/asm/aes256.asm
index 285cf69..f1c3eaf 100644
--- a/src/asm/aes256.asm
+++ b/src/asm/aes256.asm
@@ -8,7 +8,7 @@
.code
-@aesni_raw_encrypt_block256@20 proc
+@aesni_aes256_encrypt_block_@20 proc
pxor xmm0, [ecx]
aesenc xmm0, [ecx + 10h]
aesenc xmm0, [ecx + 20h]
@@ -25,9 +25,9 @@
aesenc xmm0, [ecx + 0D0h]
aesenclast xmm0, [ecx + 0E0h]
ret
-@aesni_raw_encrypt_block256@20 endp
+@aesni_aes256_encrypt_block_@20 endp
-@aesni_raw_decrypt_block256@20 proc
+@aesni_aes256_decrypt_block_@20 proc
pxor xmm0, [ecx]
aesdec xmm0, [ecx + 10h]
aesdec xmm0, [ecx + 20h]
@@ -44,9 +44,9 @@
aesdec xmm0, [ecx + 0D0h]
aesdeclast xmm0, [ecx + 0E0h]
ret
-@aesni_raw_decrypt_block256@20 endp
+@aesni_aes256_decrypt_block_@20 endp
-@aesni_raw_expand_key_schedule256@36 proc
+@aesni_aes256_expand_key_@36 proc
; A "word" (in terms of the FIPS 187 standard) is a 32-bit block.
; Words are denoted by `w[N]`.
;
@@ -239,9 +239,9 @@ aes256_keygen_assist:
pxor xmm0, xmm1
ret
-@aesni_raw_expand_key_schedule256@36 endp
+@aesni_aes256_expand_key_@36 endp
-@aesni_raw_invert_key_schedule256@8 proc
+@aesni_aes256_derive_decryption_keys_raw@8 proc
movdqa xmm5, [ecx]
movdqa xmm4, [ecx + 0E0h]
movdqa [edx], xmm4
@@ -281,6 +281,6 @@ aes256_keygen_assist:
movdqa [edx + 70h], xmm5
ret
-@aesni_raw_invert_key_schedule256@8 endp
+@aesni_aes256_derive_decryption_keys_raw@8 endp
end