From: Andy Polyakov <appro@openssl.org>
Date: Wed, 24 Sep 2014 22:42:26 +0000 (+0200)
Subject: crypto/bn/bn_nist.c: work around MSC ARM compiler bug.
X-Git-Tag: OpenSSL_1_0_0o~20
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1db72876dc605b8dedb24711c69e2d4bab159c78;p=oweals%2Fopenssl.git

crypto/bn/bn_nist.c: work around MSC ARM compiler bug.

RT: 3541
Reviewed-by: Emilia Kasper <emilia@openssl.org>
(cherry picked from commit 8b07c005fe006044d0e4a795421447deca3c9f2c)
---

diff --git a/crypto/bn/bn_nist.c b/crypto/bn/bn_nist.c
index c6de032696..904bd110c1 100644
--- a/crypto/bn/bn_nist.c
+++ b/crypto/bn/bn_nist.c
@@ -824,9 +824,9 @@ int BN_nist_mod_521(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
 	/* ... and right shift */
 	for (val=t_d[0],i=0; i<BN_NIST_521_TOP-1; i++)
 		{
-		tmp = val>>BN_NIST_521_RSHIFT;
-		val = t_d[i+1];
-		t_d[i] = (tmp | val<<BN_NIST_521_LSHIFT) & BN_MASK2;
+		t_d[i] = ( val>>BN_NIST_521_RSHIFT |
+			  (tmp=t_d[i+1])<<BN_NIST_521_LSHIFT ) & BN_MASK2;
+		val=tmp;
 		}
 	t_d[i] = val>>BN_NIST_521_RSHIFT;
 	/* lower 521 bits */