wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add some missing cfi frame info in aesni-x86_64.pl

Browse source 
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
(Merged from https://github.com/openssl/openssl/pull/10653)

(cherry picked from commit a5fe7825b970a6c937118a4f707f9ad367413794)
This commit is contained in:
Bernd Edlinger 2019-12-18 20:20:53 +01:00
parent da26d627c7
commit 572351b9cc
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
crypto/aes/asm/aesni-x86_64.pl
View file

@ -984,6 +984,7 @@ $code.=<<___;
.type aesni_ccm64_encrypt_blocks,\@function,6 .type aesni_ccm64_encrypt_blocks,\@function,6
.align 16 .align 16
aesni_ccm64_encrypt_blocks: aesni_ccm64_encrypt_blocks:
.cfi_startproc
___ ___
$code.=<<___ if ($win64); $code.=<<___ if ($win64);
lea -0x58(%rsp),%rsp lea -0x58(%rsp),%rsp
@ -1066,6 +1067,7 @@ $code.=<<___ if ($win64);
___ ___
$code.=<<___; $code.=<<___;
ret ret
.cfi_endproc
.size aesni_ccm64_encrypt_blocks,.-aesni_ccm64_encrypt_blocks .size aesni_ccm64_encrypt_blocks,.-aesni_ccm64_encrypt_blocks
___ ___
###################################################################### ######################################################################
@ -1074,6 +1076,7 @@ $code.=<<___;
.type aesni_ccm64_decrypt_blocks,\@function,6 .type aesni_ccm64_decrypt_blocks,\@function,6
.align 16 .align 16
aesni_ccm64_decrypt_blocks: aesni_ccm64_decrypt_blocks:
.cfi_startproc
___ ___
$code.=<<___ if ($win64); $code.=<<___ if ($win64);
lea -0x58(%rsp),%rsp lea -0x58(%rsp),%rsp
@ -1173,6 +1176,7 @@ $code.=<<___ if ($win64);
___ ___
$code.=<<___; $code.=<<___;
ret ret
.cfi_endproc
.size aesni_ccm64_decrypt_blocks,.-aesni_ccm64_decrypt_blocks .size aesni_ccm64_decrypt_blocks,.-aesni_ccm64_decrypt_blocks
___ ___
} }
@ -3031,6 +3035,7 @@ $code.=<<___;
.type __ocb_encrypt6,\@abi-omnipotent .type __ocb_encrypt6,\@abi-omnipotent
.align 32 .align 32
__ocb_encrypt6: __ocb_encrypt6:
.cfi_startproc
pxor $rndkey0l,@offset[5] # offset_i ^ round[0] pxor $rndkey0l,@offset[5] # offset_i ^ round[0]
movdqu ($L_p,$i1),@offset[1] movdqu ($L_p,$i1),@offset[1]
movdqa @offset[0],@offset[2] movdqa @offset[0],@offset[2]
@ -3128,11 +3133,13 @@ __ocb_encrypt6:
aesenclast @offset[4],$inout4 aesenclast @offset[4],$inout4
aesenclast @offset[5],$inout5 aesenclast @offset[5],$inout5
ret ret
.cfi_endproc
.size __ocb_encrypt6,.-__ocb_encrypt6 .size __ocb_encrypt6,.-__ocb_encrypt6
.type __ocb_encrypt4,\@abi-omnipotent .type __ocb_encrypt4,\@abi-omnipotent
.align 32 .align 32
__ocb_encrypt4: __ocb_encrypt4:
.cfi_startproc
pxor $rndkey0l,@offset[5] # offset_i ^ round[0] pxor $rndkey0l,@offset[5] # offset_i ^ round[0]
movdqu ($L_p,$i1),@offset[1] movdqu ($L_p,$i1),@offset[1]
movdqa @offset[0],@offset[2] movdqa @offset[0],@offset[2]
@ -3197,11 +3204,13 @@ __ocb_encrypt4:
aesenclast @offset[2],$inout2 aesenclast @offset[2],$inout2
aesenclast @offset[3],$inout3 aesenclast @offset[3],$inout3
ret ret
.cfi_endproc
.size __ocb_encrypt4,.-__ocb_encrypt4 .size __ocb_encrypt4,.-__ocb_encrypt4
.type __ocb_encrypt1,\@abi-omnipotent .type __ocb_encrypt1,\@abi-omnipotent
.align 32 .align 32
__ocb_encrypt1: __ocb_encrypt1:
.cfi_startproc
pxor @offset[5],$inout5 # offset_i pxor @offset[5],$inout5 # offset_i
pxor $rndkey0l,$inout5 # offset_i ^ round[0] pxor $rndkey0l,$inout5 # offset_i ^ round[0]
pxor $inout0,$checksum # accumulate checksum pxor $inout0,$checksum # accumulate checksum
@ -3232,6 +3241,7 @@ __ocb_encrypt1:
aesenclast $inout5,$inout0 aesenclast $inout5,$inout0
ret ret
.cfi_endproc
.size __ocb_encrypt1,.-__ocb_encrypt1 .size __ocb_encrypt1,.-__ocb_encrypt1
.globl aesni_ocb_decrypt .globl aesni_ocb_decrypt
@ -3513,6 +3523,7 @@ $code.=<<___;
.type __ocb_decrypt6,\@abi-omnipotent .type __ocb_decrypt6,\@abi-omnipotent
.align 32 .align 32
__ocb_decrypt6: __ocb_decrypt6:
.cfi_startproc
pxor $rndkey0l,@offset[5] # offset_i ^ round[0] pxor $rndkey0l,@offset[5] # offset_i ^ round[0]
movdqu ($L_p,$i1),@offset[1] movdqu ($L_p,$i1),@offset[1]
movdqa @offset[0],@offset[2] movdqa @offset[0],@offset[2]
@ -3604,11 +3615,13 @@ __ocb_decrypt6:
aesdeclast @offset[4],$inout4 aesdeclast @offset[4],$inout4
aesdeclast @offset[5],$inout5 aesdeclast @offset[5],$inout5
ret ret
.cfi_endproc
.size __ocb_decrypt6,.-__ocb_decrypt6 .size __ocb_decrypt6,.-__ocb_decrypt6
.type __ocb_decrypt4,\@abi-omnipotent .type __ocb_decrypt4,\@abi-omnipotent
.align 32 .align 32
__ocb_decrypt4: __ocb_decrypt4:
.cfi_startproc
pxor $rndkey0l,@offset[5] # offset_i ^ round[0] pxor $rndkey0l,@offset[5] # offset_i ^ round[0]
movdqu ($L_p,$i1),@offset[1] movdqu ($L_p,$i1),@offset[1]
movdqa @offset[0],@offset[2] movdqa @offset[0],@offset[2]
@ -3669,11 +3682,13 @@ __ocb_decrypt4:
aesdeclast @offset[2],$inout2 aesdeclast @offset[2],$inout2
aesdeclast @offset[3],$inout3 aesdeclast @offset[3],$inout3
ret ret
.cfi_endproc
.size __ocb_decrypt4,.-__ocb_decrypt4 .size __ocb_decrypt4,.-__ocb_decrypt4
.type __ocb_decrypt1,\@abi-omnipotent .type __ocb_decrypt1,\@abi-omnipotent
.align 32 .align 32
__ocb_decrypt1: __ocb_decrypt1:
.cfi_startproc
pxor @offset[5],$inout5 # offset_i pxor @offset[5],$inout5 # offset_i
pxor $rndkey0l,$inout5 # offset_i ^ round[0] pxor $rndkey0l,$inout5 # offset_i ^ round[0]
pxor $inout5,$inout0 # input ^ round[0] ^ offset_i pxor $inout5,$inout0 # input ^ round[0] ^ offset_i
@ -3703,6 +3718,7 @@ __ocb_decrypt1:
aesdeclast $inout5,$inout0 aesdeclast $inout5,$inout0
ret ret
.cfi_endproc
.size __ocb_decrypt1,.-__ocb_decrypt1 .size __ocb_decrypt1,.-__ocb_decrypt1
___ ___
} }} } }}
@ -4637,7 +4653,6 @@ __aesni_set_encrypt_key:
add \$8,%rsp add \$8,%rsp
.cfi_adjust_cfa_offset -8 .cfi_adjust_cfa_offset -8
ret ret
.cfi_endproc
.LSEH_end_set_encrypt_key: .LSEH_end_set_encrypt_key:
.align 16 .align 16
@ -4708,6 +4723,7 @@ __aesni_set_encrypt_key:
shufps \$0b10101010,%xmm1,%xmm1 # critical path shufps \$0b10101010,%xmm1,%xmm1 # critical path
xorps %xmm1,%xmm2 xorps %xmm1,%xmm2
ret ret
.cfi_endproc
.size ${PREFIX}_set_encrypt_key,.-${PREFIX}_set_encrypt_key .size ${PREFIX}_set_encrypt_key,.-${PREFIX}_set_encrypt_key
.size __aesni_set_encrypt_key,.-__aesni_set_encrypt_key .size __aesni_set_encrypt_key,.-__aesni_set_encrypt_key
___ ___