The branch master has been updated
via 275a048ffc1585a731e39d7e8e3f53766e8f48d7 (commit)
from 9d079f2744b9b624c6fe75f95fc0f766ef88ffcf (commit)
- Log -----------------------------------------------------------------
commit 275a048ffc1585a731e39d7e8e3f53766e8f48d7
Author: Bernd Edlinger <[email protected]>
Date: Sun Dec 22 15:39:58 2019 +0100
Add some missing cfi frame info in aesni-gcm-x86_64.pl
Reviewed-by: Kurt Roeckx <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/10677)
-----------------------------------------------------------------------
Summary of changes:
crypto/modes/asm/aesni-gcm-x86_64.pl | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/crypto/modes/asm/aesni-gcm-x86_64.pl
b/crypto/modes/asm/aesni-gcm-x86_64.pl
index d5ab0457f8..837c06266c 100644
--- a/crypto/modes/asm/aesni-gcm-x86_64.pl
+++ b/crypto/modes/asm/aesni-gcm-x86_64.pl
@@ -92,6 +92,7 @@ $code=<<___;
.type _aesni_ctr32_ghash_6x,\@abi-omnipotent
.align 32
_aesni_ctr32_ghash_6x:
+.cfi_startproc
vmovdqu 0x20($const),$T2 # borrow $T2, .Lone_msb
sub \$6,$len
vpxor $Z0,$Z0,$Z0 # $Z0 = 0
@@ -399,6 +400,7 @@ _aesni_ctr32_ghash_6x:
vpxor $Z0,$Xi,$Xi # modulo-scheduled
ret
+.cfi_endproc
.size _aesni_ctr32_ghash_6x,.-_aesni_ctr32_ghash_6x
___
######################################################################
@@ -545,6 +547,7 @@ $code.=<<___;
.type _aesni_ctr32_6x,\@abi-omnipotent
.align 32
_aesni_ctr32_6x:
+.cfi_startproc
vmovdqu 0x00-0x80($key),$Z0 # borrow $Z0 for $rndkey
vmovdqu 0x20($const),$T2 # borrow $T2, .Lone_msb
lea -1($rounds),%r13
@@ -631,6 +634,7 @@ _aesni_ctr32_6x:
vpshufb $Ii,$T1,$T1 # next counter value
vpxor $Z0,$inout5,$inout5
jmp .Loop_ctr32
+.cfi_endproc
.size _aesni_ctr32_6x,.-_aesni_ctr32_6x
.globl aesni_gcm_encrypt
@@ -1081,15 +1085,19 @@ $code=<<___; # assembler is too old
.globl aesni_gcm_encrypt
.type aesni_gcm_encrypt,\@abi-omnipotent
aesni_gcm_encrypt:
+.cfi_startproc
xor %eax,%eax
ret
+.cfi_endproc
.size aesni_gcm_encrypt,.-aesni_gcm_encrypt
.globl aesni_gcm_decrypt
.type aesni_gcm_decrypt,\@abi-omnipotent
aesni_gcm_decrypt:
+.cfi_startproc
xor %eax,%eax
ret
+.cfi_endproc
.size aesni_gcm_decrypt,.-aesni_gcm_decrypt
___
}}}
