[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  3f55ec6792dde6359a915f12aa0c792212bd954f (commit)
      from  64846096b18340b9a39ddd29a7a0e23c56f22959 (commit)


- Log -----------------------------------------------------------------
commit 3f55ec6792dde6359a915f12aa0c792212bd954f
Author: Adam Langley <agl at chromium.org>
Date:   Thu Feb 9 12:02:08 2017 -0800

    Fix copy-pasteism in CFI directives.
    
    I don't think this actually affects anything since the cfi_restore
    directives aren't strictly needed anyway. (The old values are still in
    memory so either will do.)
    
    CLA: trivial
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2582)

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

Summary of changes:
 crypto/bn/asm/x86_64-mont.pl  | 10 +++++-----
 crypto/bn/asm/x86_64-mont5.pl | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/crypto/bn/asm/x86_64-mont.pl b/crypto/bn/asm/x86_64-mont.pl
index cf3daa2..a4da3de 100755
--- a/crypto/bn/asm/x86_64-mont.pl
+++ b/crypto/bn/asm/x86_64-mont.pl
@@ -1381,15 +1381,15 @@ $code.=<<___;
 	mov	-48(%rsi),%r15
 .cfi_restore	%r15
 	mov	-40(%rsi),%r14
-.cfi_restore	%r15
+.cfi_restore	%r14
 	mov	-32(%rsi),%r13
-.cfi_restore	%r15
+.cfi_restore	%r13
 	mov	-24(%rsi),%r12
-.cfi_restore	%r15
+.cfi_restore	%r12
 	mov	-16(%rsi),%rbp
-.cfi_restore	%r15
+.cfi_restore	%rbp
 	mov	-8(%rsi),%rbx
-.cfi_restore	%r15
+.cfi_restore	%rbx
 	lea	(%rsi),%rsp
 .cfi_def_cfa_register	%rsp
 .Lmulx4x_epilogue:
diff --git a/crypto/bn/asm/x86_64-mont5.pl b/crypto/bn/asm/x86_64-mont5.pl
index 1bf9942..7ed2232 100755
--- a/crypto/bn/asm/x86_64-mont5.pl
+++ b/crypto/bn/asm/x86_64-mont5.pl
@@ -446,15 +446,15 @@ $code.=<<___;
 	mov	-48(%rsi),%r15
 .cfi_restore	%r15
 	mov	-40(%rsi),%r14
-.cfi_restore	%r15
+.cfi_restore	%r14
 	mov	-32(%rsi),%r13
-.cfi_restore	%r15
+.cfi_restore	%r13
 	mov	-24(%rsi),%r12
-.cfi_restore	%r15
+.cfi_restore	%r12
 	mov	-16(%rsi),%rbp
-.cfi_restore	%r15
+.cfi_restore	%rbp
 	mov	-8(%rsi),%rbx
-.cfi_restore	%r15
+.cfi_restore	%rbx
 	lea	(%rsi),%rsp
 .cfi_def_cfa_register	%rsp
 .Lmul_epilogue: