From: Andy Polyakov <appro@openssl.org>
Date: Mon, 26 Jul 2010 22:56:07 +0000 (+0000)
Subject: aes-x86_64.pl: commit#19797 was overzealous, partially reverse.
X-Git-Tag: OpenSSL-fips-2_0-rc1~1020
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=20d171377f3dbe54d298aa0d0d267ac77f28ce5c;p=oweals%2Fopenssl.git

aes-x86_64.pl: commit#19797 was overzealous, partially reverse.
---

diff --git a/crypto/aes/asm/aes-x86_64.pl b/crypto/aes/asm/aes-x86_64.pl
index f2f62cdc99..674a68c43e 100755
--- a/crypto/aes/asm/aes-x86_64.pl
+++ b/crypto/aes/asm/aes-x86_64.pl
@@ -1552,8 +1552,8 @@ $code.=<<___;
 AES_set_decrypt_key:
 	push	%rbx
 	push	%rbp
-	push	%r12			# redundant, but allows to share
-	push	%r13			# exception handler...
+	push	%r12
+	push	%r13
 	push	%r14
 	push	%r15
 	push	%rdx			# save key schedule
@@ -1609,6 +1609,10 @@ $code.=<<___;
 
 	xor	%rax,%rax
 .Labort:
+	mov	8(%rsp),%r15
+	mov	16(%rsp),%r14
+	mov	24(%rsp),%r13
+	mov	32(%rsp),%r12
 	mov	40(%rsp),%rbp
 	mov	48(%rsp),%rbx
 	add	\$56,%rsp