Skip to content

Commit

Permalink
aes: fix AES-XTS in-place decryption
Browse files Browse the repository at this point in the history 
Change-Id: If105169b2387ec56ceae8d2473d68476cb7b3725
Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
  • Loading branch information
@pablodelara
pablodelara committed May 2, 2023
1 parent 96dcbd0 commit 5afed1e
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 16 deletions.
9 changes: 5 additions & 4 deletions aes/XTS_AES_128_dec_expanded_key_vaes.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -973,15 +973,14 @@ XTS_AES_128_dec_expanded_key_vaes:
%endif

cmp N_val, 128
jl _less_than_128_bytes
jb _less_than_128_bytes

vpbroadcastq zpoly, ghash_poly_8b

cmp N_val, 256
jge _start_by16

cmp N_val, 128
jge _start_by8
jmp _start_by8

_do_n_blocks:
cmp N_val, 0
Expand Down Expand Up @@ -1009,7 +1008,7 @@ _do_n_blocks:
jge _remaining_num_blocks_is_1

;; _remaining_num_blocks_is_0:
vmovdqu xmm1, [ptr_plaintext - 16] ; Re-due last block with next tweak
vmovdqu xmm1, xmm5 ; xmm5 contains last full block to decrypt with next teawk
decrypt_initial xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm8, xmm9, na, na, na, na, na, na, xmm0, 1, 1
vmovdqu [ptr_ciphertext - 16], xmm1
vmovdqa xmm8, xmm1
Expand Down Expand Up @@ -1219,6 +1218,7 @@ _main_loop_run_16:
vmovdqu8 zmm2, [ptr_plaintext+16*4]
vmovdqu8 zmm3, [ptr_plaintext+16*8]
vmovdqu8 zmm4, [ptr_plaintext+16*12]
vmovdqu8 xmm5, [ptr_plaintext+16*15] ; Save last full block in case this is the last iteration
add ptr_plaintext, 256

decrypt_by_16_zmm zmm1, zmm2, zmm3, zmm4, zmm9, zmm10, zmm11, zmm12, zmm0, 0
Expand Down Expand Up @@ -1262,6 +1262,7 @@ _start_by8:
_main_loop_run_8:
vmovdqu8 zmm1, [ptr_plaintext+16*0]
vmovdqu8 zmm2, [ptr_plaintext+16*4]
vmovdqu8 xmm5, [ptr_plaintext+16*7] ; Save last full block in case this is the last iteration
add ptr_plaintext, 128

decrypt_by_eight_zmm zmm1, zmm2, zmm9, zmm10, zmm0, 0
Expand Down
9 changes: 5 additions & 4 deletions aes/XTS_AES_128_dec_vaes.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1006,15 +1006,14 @@ XTS_AES_128_dec_vaes:
%endif

cmp N_val, 128
jl _less_than_128_bytes
jb _less_than_128_bytes

vpbroadcastq zpoly, ghash_poly_8b

cmp N_val, 256
jge _start_by16

cmp N_val, 128
jge _start_by8
jmp _start_by8

_do_n_blocks:
cmp N_val, 0
Expand Down Expand Up @@ -1042,7 +1041,7 @@ _do_n_blocks:
jge _remaining_num_blocks_is_1

;; _remaining_num_blocks_is_0:
vmovdqu xmm1, [ptr_plaintext - 16] ; Re-due last block with next tweak
vmovdqu xmm1, xmm5 ; xmm5 contains last full block to decrypt with next teawk
decrypt_initial xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm8, xmm9, na, na, na, na, na, na, xmm0, 1, 1
vmovdqu [ptr_ciphertext - 16], xmm1
vmovdqa xmm8, xmm1
Expand Down Expand Up @@ -1252,6 +1251,7 @@ _main_loop_run_16:
vmovdqu8 zmm2, [ptr_plaintext+16*4]
vmovdqu8 zmm3, [ptr_plaintext+16*8]
vmovdqu8 zmm4, [ptr_plaintext+16*12]
vmovdqu8 xmm5, [ptr_plaintext+16*15] ; Save last full block in case this is the last iteration
add ptr_plaintext, 256

decrypt_by_16_zmm zmm1, zmm2, zmm3, zmm4, zmm9, zmm10, zmm11, zmm12, zmm0, 0
Expand Down Expand Up @@ -1295,6 +1295,7 @@ _start_by8:
_main_loop_run_8:
vmovdqu8 zmm1, [ptr_plaintext+16*0]
vmovdqu8 zmm2, [ptr_plaintext+16*4]
vmovdqu8 xmm5, [ptr_plaintext+16*7] ; Save last full block in case this is the last iteration
add ptr_plaintext, 128

decrypt_by_eight_zmm zmm1, zmm2, zmm9, zmm10, zmm0, 0
Expand Down
9 changes: 5 additions & 4 deletions aes/XTS_AES_256_dec_expanded_key_vaes.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1129,15 +1129,14 @@ XTS_AES_256_dec_expanded_key_vaes:
%endif

cmp N_val, 128
jl _less_than_128_bytes
jb _less_than_128_bytes

vpbroadcastq zpoly, ghash_poly_8b

cmp N_val, 256
jge _start_by16

cmp N_val, 128
jge _start_by8
jmp _start_by8

_do_n_blocks:
cmp N_val, 0
Expand Down Expand Up @@ -1165,7 +1164,7 @@ _do_n_blocks:
jge _remaining_num_blocks_is_1

;; _remaining_num_blocks_is_0:
vmovdqu xmm1, [ptr_plaintext - 16] ; Re-due last block with next tweak
vmovdqu xmm1, xmm5 ; xmm5 contains last full block to decrypt with next teawk
decrypt_initial xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm8, xmm9, na, na, na, na, na, na, xmm0, 1, 1
vmovdqu [ptr_ciphertext - 16], xmm1
vmovdqa xmm8, xmm1
Expand Down Expand Up @@ -1375,6 +1374,7 @@ _main_loop_run_16:
vmovdqu8 zmm2, [ptr_plaintext+16*4]
vmovdqu8 zmm3, [ptr_plaintext+16*8]
vmovdqu8 zmm4, [ptr_plaintext+16*12]
vmovdqu8 xmm5, [ptr_plaintext+16*15] ; Save last full block in case this is the last iteration
add ptr_plaintext, 256

decrypt_by_16_zmm zmm1, zmm2, zmm3, zmm4, zmm9, zmm10, zmm11, zmm12, zmm0, 0
Expand Down Expand Up @@ -1418,6 +1418,7 @@ _start_by8:
_main_loop_run_8:
vmovdqu8 zmm1, [ptr_plaintext+16*0]
vmovdqu8 zmm2, [ptr_plaintext+16*4]
vmovdqu8 xmm5, [ptr_plaintext+16*7] ; Save last full block in case this is the last iteration
add ptr_plaintext, 128

decrypt_by_eight_zmm zmm1, zmm2, zmm9, zmm10, zmm0, 0
Expand Down
9 changes: 5 additions & 4 deletions aes/XTS_AES_256_dec_vaes.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1196,15 +1196,14 @@ XTS_AES_256_dec_vaes:
%endif

cmp N_val, 128
jl _less_than_128_bytes
jb _less_than_128_bytes

vpbroadcastq zpoly, ghash_poly_8b

cmp N_val, 256
jge _start_by16

cmp N_val, 128
jge _start_by8
jmp _start_by8

_do_n_blocks:
cmp N_val, 0
Expand Down Expand Up @@ -1232,7 +1231,7 @@ _do_n_blocks:
jge _remaining_num_blocks_is_1

;; _remaining_num_blocks_is_0:
vmovdqu xmm1, [ptr_plaintext - 16] ; Re-due last block with next tweak
vmovdqu xmm1, xmm5 ; xmm5 contains last full block to decrypt with next teawk
decrypt_initial xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm8, xmm9, na, na, na, na, na, na, xmm0, 1, 1
vmovdqu [ptr_ciphertext - 16], xmm1
vmovdqa xmm8, xmm1
Expand Down Expand Up @@ -1442,6 +1441,7 @@ _main_loop_run_16:
vmovdqu8 zmm2, [ptr_plaintext+16*4]
vmovdqu8 zmm3, [ptr_plaintext+16*8]
vmovdqu8 zmm4, [ptr_plaintext+16*12]
vmovdqu8 xmm5, [ptr_plaintext+16*15] ; Save last full block in case this is the last iteration
add ptr_plaintext, 256

decrypt_by_16_zmm zmm1, zmm2, zmm3, zmm4, zmm9, zmm10, zmm11, zmm12, zmm0, 0
Expand Down Expand Up @@ -1485,6 +1485,7 @@ _start_by8:
_main_loop_run_8:
vmovdqu8 zmm1, [ptr_plaintext+16*0]
vmovdqu8 zmm2, [ptr_plaintext+16*4]
vmovdqu8 xmm5, [ptr_plaintext+16*7] ; Save last full block in case this is the last iteration
add ptr_plaintext, 128

decrypt_by_eight_zmm zmm1, zmm2, zmm9, zmm10, zmm0, 0
Expand Down

0 comments on commit 5afed1e

Please sign in to comment.