From: Andy Polyakov <appro@openssl.org>
Date: Sun, 15 Nov 2009 17:19:49 +0000 (+0000)
Subject: sha512.c: there apparently is ILP32 PowerPC platform, where it is safe to
X-Git-Tag: OpenSSL-fips-2_0-rc1~1437
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=53f73afc4d15830a7ab0b01405f9ab23a411b0bb;p=openssl

sha512.c: there apparently is ILP32 PowerPC platform, where it is safe to
inline 64-bit assembler instructions. Normally it's inappropriate, because
signalling doesn't preserve upper halves of general purpose registers.
Meaning that it's only safe if signals are blocked for the time "wide"
code executes.
PR: 1998
---

diff --git a/crypto/sha/sha512.c b/crypto/sha/sha512.c
index d1aa7614b2..cbc0e58c48 100644
--- a/crypto/sha/sha512.c
+++ b/crypto/sha/sha512.c
@@ -380,7 +380,7 @@ static const SHA_LONG64 K512[80] = {
 				((SHA_LONG64)hi)<<32|lo;	})
 #   endif
 #  elif (defined(_ARCH_PPC) && defined(__64BIT__)) || defined(_ARCH_PPC64)
-#   define ROTR(a,n)	({ unsigned long ret;		\
+#   define ROTR(a,n)	({ SHA_LONG64 ret;		\
 				asm ("rotrdi %0,%1,%2"	\
 				: "=r"(ret)		\
 				: "r"(a),"K"(n)); ret;	})