From ed2f6b813eeabc9461fc307bd6213cfbb54d7f65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= <guenter.obiltschnig@appinf.com>
Date: Sat, 8 Feb 2020 16:09:37 +0100
Subject: [PATCH] GH #2909: fix SHA2Engine for big-endian architectures
---
Foundation/src/SHA2Engine.cpp | 47 -----------------------------------
1 file changed, 47 deletions(-)
diff --git a/Foundation/src/SHA2Engine.cpp b/Foundation/src/SHA2Engine.cpp
index 7ab454218e..b09b30a796 100644
--- a/Foundation/src/SHA2Engine.cpp
+++ b/Foundation/src/SHA2Engine.cpp
@@ -151,52 +151,6 @@ static const unsigned char padding[128] = { 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
temp2 = S642(a) + F640(a,b,c); \
d += temp1; h = temp1 + temp2; \
}
-#ifdef POCO_ARCH_BIG_ENDIAN
-#ifndef GET_UINT32
-#define GET_UINT32(n,b,i) \
-do { \
- (n) = ( (Poco::UInt32) (b)[(i) ] ) \
- | ( (Poco::UInt32) (b)[(i) + 1] << 8 ) \
- | ( (Poco::UInt32) (b)[(i) + 2] << 16 ) \
- | ( (Poco::UInt32) (b)[(i) + 3] << 24 ); \
-} while( 0 )
-#endif
-#ifndef PUT_UINT32
-#define PUT_UINT32(n,b,i) \
-do { \
- (b)[(i) ] = (unsigned char) ( (n) ); \
- (b)[(i) + 1] = (unsigned char) ( (n) >> 8 ); \
- (b)[(i) + 2] = (unsigned char) ( (n) >> 16 ); \
- (b)[(i) + 3] = (unsigned char) ( (n) >> 24 ); \
-} while( 0 )
-#endif
-#ifndef GET_UINT64
-#define GET_UINT64(n,b,i) \
-{ \
- (n) = ( (Poco::UInt64) (b)[(i) ] ) \
- | ( (Poco::UInt64) (b)[(i) + 1] << 8 ) \
- | ( (Poco::UInt64) (b)[(i) + 2] << 16 ) \
- | ( (Poco::UInt64) (b)[(i) + 3] << 24 ) \
- | ( (Poco::UInt64) (b)[(i) + 4] << 32 ) \
- | ( (Poco::UInt64) (b)[(i) + 5] << 40 ) \
- | ( (Poco::UInt64) (b)[(i) + 6] << 48 ) \
- | ( (Poco::UInt64) (b)[(i) + 7] << 56 ); \
-}
-#endif
-#ifndef PUT_UINT64
-#define PUT_UINT64(n,b,i) \
-{ \
- (b)[(i) ] = (unsigned char) ( (n) ); \
- (b)[(i) + 1] = (unsigned char) ( (n) >> 8 ); \
- (b)[(i) + 2] = (unsigned char) ( (n) >> 16 ); \
- (b)[(i) + 3] = (unsigned char) ( (n) >> 24 ); \
- (b)[(i) + 4] = (unsigned char) ( (n) >> 32 ); \
- (b)[(i) + 5] = (unsigned char) ( (n) >> 40 ); \
- (b)[(i) + 6] = (unsigned char) ( (n) >> 48 ); \
- (b)[(i) + 7] = (unsigned char) ( (n) >> 56 ); \
-}
-#endif
-#else
#ifndef GET_UINT32
#define GET_UINT32(n,b,i) \
do { \
@@ -241,7 +195,6 @@ do { \
(b)[(i) + 7] = (unsigned char) ( (n) ); \
}
#endif
-#endif
SHA2Engine::SHA2Engine(ALGORITHM algorithm):