From: Andy Polyakov <appro@openssl.org>
Date: Thu, 14 Apr 2005 07:41:29 +0000 (+0000)
Subject: Fix for bug emerged in openvpn conext.
X-Git-Tag: OpenSSL_0_9_8-beta1~13^2~188
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=026bb0b96a8359d9a08f79ad151c6a1233cc82c8;p=oweals%2Fopenssl.git

Fix for bug emerged in openvpn conext.
---

diff --git a/crypto/engine/eng_padlock.c b/crypto/engine/eng_padlock.c
index 87e62d0d5d..31873520cd 100644
--- a/crypto/engine/eng_padlock.c
+++ b/crypto/engine/eng_padlock.c
@@ -395,10 +395,10 @@ padlock_verify_context(struct padlock_cipher_data *cdata)
 "	jnc	1f\n"
 "	cmp	%2,%1\n"
 "	je	1f\n"
-"	mov	%2,%0\n"
 "	popfl\n"
 "	sub	$4,%%esp\n"
-"1:	add	$4,%%esp"
+"1:	add	$4,%%esp\n"
+"	mov	%2,%0"
 	:"+m"(padlock_saved_context)
 	: "r"(padlock_saved_context), "r"(cdata) : "cc");
 }
@@ -521,10 +521,10 @@ padlock_verify_context(void *cdata)
 		jnc	skip
 		cmp	ecx,padlock_saved_context
 		je	skip
-		mov	padlock_saved_context,ecx
 		popfd
 		sub	esp,4
 	skip:	add	esp,4
+		mov	padlock_saved_context,ecx
 		}
 }