[openssl] master update

[bernd.edlinger at hotmail.de]

The branch master has been updated
       via  b2a00f62209add348deb8283c588ddbd572dc216 (commit)
      from  048fa13e5ef4ccd730561f79a6c91f38365994d1 (commit)


- Log -----------------------------------------------------------------
commit b2a00f62209add348deb8283c588ddbd572dc216
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Sun Dec 22 18:50:51 2019 +0100

    Add some missing cfi frame info in rc4-md5-x86_64.pl
    
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    (Merged from https://github.com/openssl/openssl/pull/10679)

-----------------------------------------------------------------------

Summary of changes:
 crypto/rc4/asm/rc4-md5-x86_64.pl | 2 ++
 crypto/rc4/asm/rc4-x86_64.pl     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/crypto/rc4/asm/rc4-md5-x86_64.pl b/crypto/rc4/asm/rc4-md5-x86_64.pl
index c9381ca9b2..560eb4c432 100644
--- a/crypto/rc4/asm/rc4-md5-x86_64.pl
+++ b/crypto/rc4/asm/rc4-md5-x86_64.pl
@@ -486,6 +486,7 @@ $code.=<<___;
 .type	RC4_set_key,\@function,3
 .align	16
 RC4_set_key:
+.cfi_startproc
 	lea	8($dat),$dat
 	lea	($inp,$len),$inp
 	neg	$len
@@ -521,6 +522,7 @@ RC4_set_key:
 	mov	%eax,-8($dat)
 	mov	%eax,-4($dat)
 	ret
+.cfi_endproc
 .size	RC4_set_key,.-RC4_set_key
 
 .globl	RC4_options
diff --git a/crypto/rc4/asm/rc4-x86_64.pl b/crypto/rc4/asm/rc4-x86_64.pl
index ebca0473ab..7c0f1a4cb7 100755
--- a/crypto/rc4/asm/rc4-x86_64.pl
+++ b/crypto/rc4/asm/rc4-x86_64.pl
@@ -455,6 +455,7 @@ $code.=<<___;
 .type	RC4_set_key,\@function,3
 .align	16
 RC4_set_key:
+.cfi_startproc
 	lea	8($dat),$dat
 	lea	($inp,$len),$inp
 	neg	$len
@@ -521,6 +522,7 @@ RC4_set_key:
 	mov	%eax,-8($dat)
 	mov	%eax,-4($dat)
 	ret
+.cfi_endproc
 .size	RC4_set_key,.-RC4_set_key
 
 .globl	RC4_options