Skip to content

Commit e7d829c

Browse files
mdcornupablodelara
authored andcommitted
aes: rename internal key expansion symbols
Signed-off-by: Marcel Cornu <[email protected]>
1 parent 72e7873 commit e7d829c

File tree

4 files changed

+30
-30
lines changed

4 files changed

+30
-30
lines changed

aes/keyexp_128.asm

+9-9
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ section .text
7474
; arg 2: rdx: pointer to expanded key array for encrypt
7575
; arg 3: r8: pointer to expanded key array for decrypt
7676
;
77-
mk_global aes_keyexp_128_sse, function, internal
78-
aes_keyexp_128_sse:
77+
mk_global _aes_keyexp_128_sse, function, internal
78+
_aes_keyexp_128_sse:
7979
endbranch
8080
movdqu xmm1, [KEY] ; loading the AES key
8181
movdqu [EXP_ENC_KEYS + 16*0], xmm1
@@ -148,8 +148,8 @@ aes_keyexp_128_sse:
148148
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
149149
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
150150

151-
mk_global aes_keyexp_128_avx, function, internal
152-
aes_keyexp_128_avx:
151+
mk_global _aes_keyexp_128_avx, function, internal
152+
_aes_keyexp_128_avx:
153153
endbranch
154154
vmovdqu xmm1, [KEY] ; loading the AES key
155155
vmovdqu [EXP_ENC_KEYS + 16*0], xmm1
@@ -222,14 +222,14 @@ aes_keyexp_128_avx:
222222
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
223223
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
224224

225-
; void aes_keyexp_128_enc_sse(UINT8 *key,
225+
; void _aes_keyexp_128_enc_sse(UINT8 *key,
226226
; UINT8 *enc_exp_keys);
227227
;
228228
; arg 1: rcx: pointer to key
229229
; arg 2: rdx: pointer to expanded key array for encrypt
230230
;
231-
mk_global aes_keyexp_128_enc_sse, function, internal
232-
aes_keyexp_128_enc_sse:
231+
mk_global _aes_keyexp_128_enc_sse, function, internal
232+
_aes_keyexp_128_enc_sse:
233233
endbranch
234234
movdqu xmm1, [KEY] ; loading the AES key
235235
movdqu [EXP_ENC_KEYS + 16*0], xmm1
@@ -277,8 +277,8 @@ aes_keyexp_128_enc_sse:
277277

278278
ret
279279

280-
mk_global aes_keyexp_128_enc_avx, function, internal
281-
aes_keyexp_128_enc_avx:
280+
mk_global _aes_keyexp_128_enc_avx, function, internal
281+
_aes_keyexp_128_enc_avx:
282282
endbranch
283283
vmovdqu xmm1, [KEY] ; loading the AES key
284284
vmovdqu [EXP_ENC_KEYS + 16*0], xmm1

aes/keyexp_192.asm

+4-4
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ section .text
117117
; arg 2: rdx: pointer to expanded key array for encrypt
118118
; arg 3: r8: pointer to expanded key array for decrypt
119119
;
120-
mk_global aes_keyexp_192_sse, function, internal
121-
aes_keyexp_192_sse:
120+
mk_global _aes_keyexp_192_sse, function, internal
121+
_aes_keyexp_192_sse:
122122
endbranch
123123

124124
%ifnidn __OUTPUT_FORMAT__, elf64
@@ -196,8 +196,8 @@ aes_keyexp_192_sse:
196196

197197

198198

199-
mk_global aes_keyexp_192_avx, function, internal
200-
aes_keyexp_192_avx:
199+
mk_global _aes_keyexp_192_avx, function, internal
200+
_aes_keyexp_192_avx:
201201
endbranch
202202

203203
%ifnidn __OUTPUT_FORMAT__, elf64

aes/keyexp_256.asm

+4-4
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ section .text
9898
; arg 2: rdx: pointer to expanded key array for encrypt
9999
; arg 3: r8: pointer to expanded key array for decrypt
100100
;
101-
mk_global aes_keyexp_256_sse, function, internal
102-
aes_keyexp_256_sse:
101+
mk_global _aes_keyexp_256_sse, function, internal
102+
_aes_keyexp_256_sse:
103103
endbranch
104104
movdqu xmm1, [KEY] ; loading the AES key
105105
movdqu [EXP_ENC_KEYS + 16*0], xmm1
@@ -192,8 +192,8 @@ aes_keyexp_256_sse:
192192
ret
193193

194194

195-
mk_global aes_keyexp_256_avx, function, internal
196-
aes_keyexp_256_avx:
195+
mk_global _aes_keyexp_256_avx, function, internal
196+
_aes_keyexp_256_avx:
197197
endbranch
198198
vmovdqu xmm1, [KEY] ; loading the AES key
199199
vmovdqu [EXP_ENC_KEYS + 16*0], xmm1

aes/keyexp_multibinary.asm

+13-13
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ default rel
3232

3333
%include "reg_sizes.asm"
3434

35-
extern aes_keyexp_128_sse
36-
extern aes_keyexp_128_avx
37-
extern aes_keyexp_128_enc_sse
38-
extern aes_keyexp_128_enc_avx
35+
extern _aes_keyexp_128_sse
36+
extern _aes_keyexp_128_avx
37+
extern _aes_keyexp_128_enc_sse
38+
extern _aes_keyexp_128_enc_avx
3939

40-
extern aes_keyexp_192_sse
41-
extern aes_keyexp_192_avx
40+
extern _aes_keyexp_192_sse
41+
extern _aes_keyexp_192_avx
4242

43-
extern aes_keyexp_256_sse
44-
extern aes_keyexp_256_avx
43+
extern _aes_keyexp_256_sse
44+
extern _aes_keyexp_256_avx
4545

4646
%include "multibinary.asm"
4747

@@ -50,16 +50,16 @@ extern aes_keyexp_256_avx
5050
; instantiate aes_keyexp_128 interfaces
5151
;;;;
5252
mbin_interface _aes_keyexp_128
53-
mbin_dispatch_init _aes_keyexp_128, aes_keyexp_128_sse, aes_keyexp_128_avx, aes_keyexp_128_avx
53+
mbin_dispatch_init _aes_keyexp_128, _aes_keyexp_128_sse, _aes_keyexp_128_avx, _aes_keyexp_128_avx
5454

55-
mbin_interface aes_keyexp_128_enc
56-
mbin_dispatch_init aes_keyexp_128_enc, aes_keyexp_128_enc_sse, aes_keyexp_128_enc_avx, aes_keyexp_128_enc_avx
55+
mbin_interface _aes_keyexp_128_enc
56+
mbin_dispatch_init _aes_keyexp_128_enc, _aes_keyexp_128_enc_sse, _aes_keyexp_128_enc_avx, _aes_keyexp_128_enc_avx
5757

5858
mbin_interface _aes_keyexp_192
59-
mbin_dispatch_init _aes_keyexp_192, aes_keyexp_192_sse, aes_keyexp_192_avx, aes_keyexp_192_avx
59+
mbin_dispatch_init _aes_keyexp_192, _aes_keyexp_192_sse, _aes_keyexp_192_avx, _aes_keyexp_192_avx
6060

6161
mbin_interface _aes_keyexp_256
62-
mbin_dispatch_init _aes_keyexp_256, aes_keyexp_256_sse, aes_keyexp_256_avx, aes_keyexp_256_avx
62+
mbin_dispatch_init _aes_keyexp_256, _aes_keyexp_256_sse, _aes_keyexp_256_avx, _aes_keyexp_256_avx
6363

6464
section .text
6565
;;; func core, ver, snum

0 commit comments

Comments
 (0)