diff options
author | Egor Tensin <Egor.Tensin@gmail.com> | 2015-07-28 21:34:15 +0300 |
---|---|---|
committer | Egor Tensin <Egor.Tensin@gmail.com> | 2015-07-28 21:34:15 +0300 |
commit | 53dfe511dc29beb8d399e95dfa93b6d3baed6b57 (patch) | |
tree | a0069dba9da96fe6cfc415b4c4fdc2d914cbd593 /src/asm | |
parent | code style (diff) | |
download | aes-tools-53dfe511dc29beb8d399e95dfa93b6d3baed6b57.tar.gz aes-tools-53dfe511dc29beb8d399e95dfa93b6d3baed6b57.zip |
refactoring
Namely, rename API functions to facilitate metaprogramming using
preprocessor macros.
Diffstat (limited to 'src/asm')
-rw-r--r-- | src/asm/aes128.asm | 16 | ||||
-rw-r--r-- | src/asm/aes192.asm | 16 | ||||
-rw-r--r-- | src/asm/aes256.asm | 16 |
3 files changed, 24 insertions, 24 deletions
diff --git a/src/asm/aes128.asm b/src/asm/aes128.asm index 70d2010..af9c839 100644 --- a/src/asm/aes128.asm +++ b/src/asm/aes128.asm @@ -8,7 +8,7 @@ .code -@aesni_aes128_encrypt_block_@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_aes128_encrypt_block_@20 endp +@aesni_AES128_encrypt_block_@20 endp -@aesni_aes128_decrypt_block_@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_aes128_decrypt_block_@20 endp +@aesni_AES128_decrypt_block_@20 endp -@aesni_aes128_expand_key_@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_aes128_expand_key_@20 endp +@aesni_AES128_expand_key_@20 endp -@aesni_aes128_derive_decryption_keys_@8 proc +@aesni_AES128_derive_decryption_keys_@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_aes128_derive_decryption_keys_@8 endp +@aesni_AES128_derive_decryption_keys_@8 endp end diff --git a/src/asm/aes192.asm b/src/asm/aes192.asm index cd28143..05e4f08 100644 --- a/src/asm/aes192.asm +++ b/src/asm/aes192.asm @@ -8,7 +8,7 @@ .code -@aesni_aes192_encrypt_block_@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_aes192_encrypt_block_@20 endp +@aesni_AES192_encrypt_block_@20 endp -@aesni_aes192_decrypt_block_@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_aes192_decrypt_block_@20 endp +@aesni_AES192_decrypt_block_@20 endp -@aesni_aes192_expand_key_@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_aes192_expand_key_@36 endp +@aesni_AES192_expand_key_@36 endp -@aesni_aes192_derive_decryption_keys_@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_aes192_derive_decryption_keys_@8 endp +@aesni_AES192_derive_decryption_keys_@8 endp end diff --git a/src/asm/aes256.asm b/src/asm/aes256.asm index 9f1e735..0d19c26 100644 --- a/src/asm/aes256.asm +++ b/src/asm/aes256.asm @@ -8,7 +8,7 @@ .code -@aesni_aes256_encrypt_block_@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_aes256_encrypt_block_@20 endp +@aesni_AES256_encrypt_block_@20 endp -@aesni_aes256_decrypt_block_@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_aes256_decrypt_block_@20 endp +@aesni_AES256_decrypt_block_@20 endp -@aesni_aes256_expand_key_@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_aes256_expand_key_@36 endp +@aesni_AES256_expand_key_@36 endp -@aesni_aes256_derive_decryption_keys_@8 proc +@aesni_AES256_derive_decryption_keys_@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_aes256_derive_decryption_keys_@8 endp +@aesni_AES256_derive_decryption_keys_@8 endp end |