Skip to content

Commit 37ddc36

Browse files
committed
aes: [XTS] reuse 128-bit key implementations for 256-bit key ones
Signed-off-by: Pablo de Lara <[email protected]>
1 parent 20e19f1 commit 37ddc36

4 files changed

+18
-3397
lines changed

aes/XTS_AES_128_dec_expanded_key_vaes.asm

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,10 @@ default rel
5151
%define VARIABLE_OFFSET 16*8 + 16*10 + 8*3 ; stack frame size for tweak values, XMM6-15 and GP regs
5252
%endif
5353

54+
%ifndef NROUNDS
5455
%define NROUNDS 9
55-
56+
%define FUNC _XTS_AES_128_dec_expanded_key_vaes
57+
%endif
5658
%define GHASH_POLY 0x87
5759

5860
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -328,8 +330,8 @@ default rel
328330

329331
section .text
330332

331-
mk_global _XTS_AES_128_dec_expanded_key_vaes, function, internal
332-
_XTS_AES_128_dec_expanded_key_vaes:
333+
mk_global FUNC, function, internal
334+
FUNC:
333335
endbranch
334336

335337
push rbp

aes/XTS_AES_128_enc_expanded_key_vaes.asm

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,10 @@ default rel
5151
%define VARIABLE_OFFSET 16*8 + 16*10 + 8*3 ; stack frame size for tweak values, XMM6-15 and GP regs
5252
%endif
5353

54+
%ifndef NROUNDS
5455
%define NROUNDS 9
56+
%define FUNC _XTS_AES_128_enc_expanded_key_vaes
57+
%endif
5558

5659
%define GHASH_POLY 0x87
5760

@@ -379,8 +382,8 @@ default rel
379382

380383
section .text
381384

382-
mk_global _XTS_AES_128_enc_expanded_key_vaes, function, internal
383-
_XTS_AES_128_enc_expanded_key_vaes:
385+
mk_global FUNC, function, internal
386+
FUNC:
384387
endbranch
385388

386389
push rbp

0 commit comments

Comments
 (0)