[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  7123aa81e9fb19afb11fdf3850662c5f7ff1f19c (commit)
      from  b4b42ce6213a7c5787460d072dabcd496aebfac8 (commit)


- Log -----------------------------------------------------------------
commit 7123aa81e9fb19afb11fdf3850662c5f7ff1f19c
Author: Andy Polyakov <appro at openssl.org>
Date:   Sun Jul 31 21:19:57 2016 +0200

    sha/asm/sha1-x86_64.pl: fix crash in SHAEXT code on Windows.
    
    RT#4530
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

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

Summary of changes:
 crypto/sha/asm/sha1-x86_64.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/sha/asm/sha1-x86_64.pl b/crypto/sha/asm/sha1-x86_64.pl
index e8f61ab..97baae3 100755
--- a/crypto/sha/asm/sha1-x86_64.pl
+++ b/crypto/sha/asm/sha1-x86_64.pl
@@ -380,9 +380,9 @@ $code.=<<___;
 .align	16
 .Loop_shaext:
 	dec		$num
-	lea		0x40($inp),%rax		# next input block
+	lea		0x40($inp),%r8		# next input block
 	paddd		@MSG[0],$E
-	cmovne		%rax,$inp
+	cmovne		%r8,$inp
 	movdqa		$ABCD,$ABCD_SAVE	# offload $ABCD
 ___
 for($i=0;$i<20-4;$i+=2) {