From: Andy Polyakov <appro@openssl.org>
Date: Sat, 18 Jun 2016 13:37:25 +0000 (+0200)
Subject: aes/asm/bsaes-armv7.pl: fix XTS decrypt test failure.
X-Git-Tag: OpenSSL_1_0_2i~137
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b62e9bf5cbbe278b7e0017c9234999dae68ee867;p=oweals%2Fopenssl.git

aes/asm/bsaes-armv7.pl: fix XTS decrypt test failure.

RT#4578

Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 3d32bab8f1742a3b57742e18f92a408f0403df8d)
---

diff --git a/crypto/aes/asm/bsaes-armv7.pl b/crypto/aes/asm/bsaes-armv7.pl
index fcc81d1a49..0c9ddf64f9 100644
--- a/crypto/aes/asm/bsaes-armv7.pl
+++ b/crypto/aes/asm/bsaes-armv7.pl
@@ -2361,9 +2361,9 @@ $code.=<<___;
 	veor		@XMM[0], @XMM[8]
 	mov		r1, sp
 	vst1.8		{@XMM[0]}, [sp,:128]
+	mov		r5, $magic			@ preserve magic
 	mov		r2, $key
 	mov		r4, $fp				@ preserve fp
-	mov		r5, $magic			@ preserve magic
 
 	bl		AES_decrypt