VeraCrypt
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2017-07-17 15:46:10 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2017-07-18 23:12:22 (GMT)
commitb37d7324081027c5b7f5de89b6ccb22742c90458 (patch)
tree561bd1604bb694f0b64ce4988c69a99454ccb080
parent86a78d55ed41758ca939f9f91bd5ab92549278e2 (diff)
downloadVeraCrypt-b37d7324081027c5b7f5de89b6ccb22742c90458.zip
VeraCrypt-b37d7324081027c5b7f5de89b6ccb22742c90458.tar.gz
Windows MBR Bootloader: workaround for 16-bit compiler internal error when compiling Camellia source code. In GET_UINT32_BE macro, we use |= operator instead of ORing shift values.
-rw-r--r--src/Crypto/CamelliaSmall.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Crypto/CamelliaSmall.c b/src/Crypto/CamelliaSmall.c
index 8ba7ed7..d6911d6 100644
--- a/src/Crypto/CamelliaSmall.c
+++ b/src/Crypto/CamelliaSmall.c
@@ -43,10 +43,10 @@
#ifndef GET_UINT32_BE
#define GET_UINT32_BE(n,b,i) \
{ \
- (n) = ( (unsigned __int32) (b)[(i) ] << 24 ) \
- | ( (unsigned __int32) (b)[(i) + 1] << 16 ) \
- | ( (unsigned __int32) (b)[(i) + 2] << 8 ) \
- | ( (unsigned __int32) (b)[(i) + 3] ); \
+ (n) = ( (unsigned __int32) (b)[(i) ] << 24 ); \
+ (n)|= ( (unsigned __int32) (b)[(i) + 1] << 16 ); \
+ (n)|= ( (unsigned __int32) (b)[(i) + 2] << 8 ); \
+ (n)|= ( (unsigned __int32) (b)[(i) + 3] ); \
}
#endif