[openssl-commits] [openssl] master update

[Kurt Roeckx]

The branch master has been updated
       via  df057ea6c8a20e4babc047689507dfafde59ffd6 (commit)
      from  da15ce2212ffcba0a1fa7263ebd1b434dd60d040 (commit)


- Log -----------------------------------------------------------------
commit df057ea6c8a20e4babc047689507dfafde59ffd6
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Wed Feb 3 18:54:02 2016 +0100

    Restore xmm7 from the correct address on win64
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    
    RT: #4288, MR: #1831

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

Summary of changes:
 crypto/modes/asm/aesni-gcm-x86_64.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/modes/asm/aesni-gcm-x86_64.pl b/crypto/modes/asm/aesni-gcm-x86_64.pl
index a56d1a7..53b961b 100644
--- a/crypto/modes/asm/aesni-gcm-x86_64.pl
+++ b/crypto/modes/asm/aesni-gcm-x86_64.pl
@@ -490,7 +490,7 @@ $code.=<<___;
 ___
 $code.=<<___ if ($win64);
 	movaps	-0xd8(%rax),%xmm6
-	movaps	-0xd8(%rax),%xmm7
+	movaps	-0xc8(%rax),%xmm7
 	movaps	-0xb8(%rax),%xmm8
 	movaps	-0xa8(%rax),%xmm9
 	movaps	-0x98(%rax),%xmm10