summaryrefslogtreecommitdiff
path: root/crypto/aes
diff options
context:
space:
mode:
authorappro <appro>2010-07-26 22:56:07 +0000
committerappro <appro>2010-07-26 22:56:07 +0000
commit04ae2cb9b5af25865ec71fcc658b8deb26d9ae36 (patch)
treed5910cea9b8cae8e7a2ddd5c2ab25a94eac8697f /crypto/aes
parentd808455d0a3c1ca3c5c96959b37158cfb424e6d9 (diff)
downloadopenssl-04ae2cb9b5af25865ec71fcc658b8deb26d9ae36.tar.gz
aes-x86_64.pl: commit#19797 was overzealous, partially reverse.
Diffstat (limited to 'crypto/aes')
-rwxr-xr-xcrypto/aes/asm/aes-x86_64.pl8
1 files changed, 6 insertions, 2 deletions
diff --git a/crypto/aes/asm/aes-x86_64.pl b/crypto/aes/asm/aes-x86_64.pl
index f2f62cdc9..674a68c43 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