Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-12 19:38:26 -06:00
Code Activity

Linux: fix various compilation issues under Linux.

Browse Source
This commit is contained in:
Mounir IDRASSI
2016-08-17 00:06:57 +02:00
parent e47f94cb43
commit 2780ac962e
17 changed files with 2361 additions and 2329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Common/Crypto.c
View File

@@ -760,7 +760,7 @@ int GetMaxPkcs5OutSize (void)
{
int size = 32;
size = max (size, EAGetLargestKeyForMode (XTS) * 2); // Sizes of primary + secondary keys
size = VC_MAX (size, EAGetLargestKeyForMode (XTS) * 2); // Sizes of primary + secondary keys
return size;
}

4
src/Common/Crypto.h
View File

@@ -171,9 +171,9 @@ typedef struct
#else
#ifdef TC_WINDOWS_BOOT
#define MAX_EXPANDED_KEY max((AES_KS + SERPENT_KS + TWOFISH_KS), CAMELLIA_KS)
#define MAX_EXPANDED_KEY VC_MAX((AES_KS + SERPENT_KS + TWOFISH_KS), CAMELLIA_KS)
#else
#define MAX_EXPANDED_KEY max(max(max((AES_KS + SERPENT_KS + TWOFISH_KS), GOST_KS), CAMELLIA_KS), KUZNYECHIK_KS)
#define MAX_EXPANDED_KEY VC_MAX(VC_MAX(VC_MAX((AES_KS + SERPENT_KS + TWOFISH_KS), GOST_KS), CAMELLIA_KS), KUZNYECHIK_KS)
#endif
#endif

4
src/Common/Tcdefs.h
View File

@@ -75,6 +75,9 @@ extern unsigned short _rotl16(unsigned short value, unsigned char shift);
#define WIDE(x) (LPWSTR)L##x
#define VC_MAX(a,b) ((a)>(b))?(a):(b)
#define VC_MIN(a,b) ((a)<(b))?(a):(b)
#ifdef _MSC_VER
typedef __int8 int8;
@@ -100,6 +103,7 @@ typedef unsigned __int64 uint64;
#include <inttypes.h>
#include <limits.h>
#include <memory.h>
typedef int8_t int8;
typedef int16_t int16;