root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

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

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
(Merged from https://github.com/openssl/openssl/pull/10642)
This commit is contained in:
Bernd Edlinger 2019-12-18 10:12:26 +01:00
parent 74a5808b3b
commit 6b913be708
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crypto/camellia/asm/cmll-x86_64.pl
View File

@ -127,11 +127,13 @@ $code=<<___;
.type Camellia_EncryptBlock,\@abi-omnipotent .type Camellia_EncryptBlock,\@abi-omnipotent
.align 16 .align 16
Camellia_EncryptBlock: Camellia_EncryptBlock:
.cfi_startproc
movl \$128,%eax movl \$128,%eax
subl $arg0d,%eax subl $arg0d,%eax
movl \$3,$arg0d movl \$3,$arg0d
adcl \$0,$arg0d # keyBitLength==128?3:4 adcl \$0,$arg0d # keyBitLength==128?3:4
jmp .Lenc_rounds jmp .Lenc_rounds
.cfi_endproc
.size Camellia_EncryptBlock,.-Camellia_EncryptBlock .size Camellia_EncryptBlock,.-Camellia_EncryptBlock
# V2 # V2
.globl Camellia_EncryptBlock_Rounds .globl Camellia_EncryptBlock_Rounds
@ -200,6 +202,7 @@ Camellia_EncryptBlock_Rounds:
.type _x86_64_Camellia_encrypt,\@abi-omnipotent .type _x86_64_Camellia_encrypt,\@abi-omnipotent
.align 16 .align 16
_x86_64_Camellia_encrypt: _x86_64_Camellia_encrypt:
.cfi_startproc
xor 0($key),@S[1] xor 0($key),@S[1]
xor 4($key),@S[0] # ^=key[0-3] xor 4($key),@S[0] # ^=key[0-3]
xor 8($key),@S[3] xor 8($key),@S[3]
@ -243,6 +246,7 @@ $code.=<<___;
mov $t3,@S[3] mov $t3,@S[3]
.byte 0xf3,0xc3 # rep ret .byte 0xf3,0xc3 # rep ret
.cfi_endproc
.size _x86_64_Camellia_encrypt,.-_x86_64_Camellia_encrypt .size _x86_64_Camellia_encrypt,.-_x86_64_Camellia_encrypt
# V1.x API # V1.x API
@ -250,11 +254,13 @@ $code.=<<___;
.type Camellia_DecryptBlock,\@abi-omnipotent .type Camellia_DecryptBlock,\@abi-omnipotent
.align 16 .align 16
Camellia_DecryptBlock: Camellia_DecryptBlock:
.cfi_startproc
movl \$128,%eax movl \$128,%eax
subl $arg0d,%eax subl $arg0d,%eax
movl \$3,$arg0d movl \$3,$arg0d
adcl \$0,$arg0d # keyBitLength==128?3:4 adcl \$0,$arg0d # keyBitLength==128?3:4
jmp .Ldec_rounds jmp .Ldec_rounds
.cfi_endproc
.size Camellia_DecryptBlock,.-Camellia_DecryptBlock .size Camellia_DecryptBlock,.-Camellia_DecryptBlock
# V2 # V2
.globl Camellia_DecryptBlock_Rounds .globl Camellia_DecryptBlock_Rounds
@ -323,6 +329,7 @@ Camellia_DecryptBlock_Rounds:
.type _x86_64_Camellia_decrypt,\@abi-omnipotent .type _x86_64_Camellia_decrypt,\@abi-omnipotent
.align 16 .align 16
_x86_64_Camellia_decrypt: _x86_64_Camellia_decrypt:
.cfi_startproc
xor 0($key),@S[1] xor 0($key),@S[1]
xor 4($key),@S[0] # ^=key[0-3] xor 4($key),@S[0] # ^=key[0-3]
xor 8($key),@S[3] xor 8($key),@S[3]
@ -367,6 +374,7 @@ $code.=<<___;
mov $t1,@S[3] mov $t1,@S[3]
.byte 0xf3,0xc3 # rep ret .byte 0xf3,0xc3 # rep ret
.cfi_endproc
.size _x86_64_Camellia_decrypt,.-_x86_64_Camellia_decrypt .size _x86_64_Camellia_decrypt,.-_x86_64_Camellia_decrypt
___ ___