From: Andy Polyakov <appro@openssl.org>
Date: Fri, 8 Nov 2013 22:00:35 +0000 (+0100)
Subject: engines/ccgost/gost89.h: make word32 defintion unconditional.
X-Git-Tag: OpenSSL_1_0_1f~27
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5b98979712bf699c335160341d159acec6890829;p=oweals%2Fopenssl.git

engines/ccgost/gost89.h: make word32 defintion unconditional.

Original definition depended on __LONG_MAX__ that is not guaranteed to
be present. As we don't support platforms with int narrower that 32 bits
it's appropriate to make defition inconditional.

PR: 3165
(cherry picked from commit 96180cac04591abfe50fc86096365553484bde65)
---

diff --git a/engines/ccgost/gost89.h b/engines/ccgost/gost89.h
index 2157852519..8da2407b03 100644
--- a/engines/ccgost/gost89.h
+++ b/engines/ccgost/gost89.h
@@ -87,10 +87,6 @@ extern gost_subst_block Gost28147_CryptoProParamSetB;
 extern gost_subst_block Gost28147_CryptoProParamSetC;
 extern gost_subst_block Gost28147_CryptoProParamSetD;
 extern const byte CryptoProKeyMeshingKey[]; 
-#if __LONG_MAX__ > 2147483647L 
 typedef unsigned int word32; 
-#else 
-typedef unsigned long word32; 
-#endif 
 
 #endif