--- truecrypt/common/tcdefs.h	2018/04/24 16:38:02	1.1.1.2
+++ truecrypt/common/tcdefs.h	2018/04/24 16:45:29	1.1.1.11
@@ -1,24 +1,36 @@
-/* Copyright (C) 2004 TrueCrypt Team, truecrypt.org
-   This product uses components written by Paul Le Roux <pleroux@swprofessionals.com> */
+/* Legal Notice: The source code contained in this file has been derived from
+   the source code of Encryption for the Masses 2.02a, which is Copyright (c)
+   1998-99 Paul Le Roux and which is covered by the 'License Agreement for
+   Encryption for the Masses'. Modifications and additions to that source code
+   contained in this file are Copyright (c) 2004-2006 TrueCrypt Foundation and
+   Copyright (c) 2004 TrueCrypt Team, and are covered by TrueCrypt License 2.1
+   the full text of which is contained in the file License.txt included in
+   TrueCrypt binary and source code distribution archives.  */
 
 // Version displayed to user 
-#define VERSION_STRING                  "1.0a"
+#define VERSION_STRING                  "4.2a"
 
 // Version number to compare against driver
-#define VERSION_NUM						0x010a
+#define VERSION_NUM						0x042a
 
 // Version number written to volume header during format,
 // specifies the minimum program version required to mount the volume
-#define VOLUME_VERSION_NUM				0x0100 
+#define VOL_REQ_PROG_VERSION			0x0410
 
-#define TC_MAX_PATH						260	/* Includes the null terminator */
-#define SECTOR_SIZE                     512	/* sector size */
+// Volume header version
+#define VOLUME_HEADER_VERSION			0x0002 
+
+#define SECTOR_SIZE                     512	/* Filesystem sector size */
 
-#define BYTES_PER_KB                    1024	
-#define BYTES_PER_MB                    1048576
+#define BYTES_PER_KB                    1024LL
+#define BYTES_PER_MB                    1048576LL
+#define BYTES_PER_GB                    1073741824LL
+#define BYTES_PER_TB                    1099511627776LL
+#define BYTES_PER_PB                    1125899906842624LL
 
 /* GUI/driver errors */
 
+#define ERR_SUCCESS                     0
 #define ERR_OS_ERROR                    1
 #define ERR_OUTOFMEMORY                 2
 #define ERR_PASSWORD_WRONG              3
@@ -36,6 +48,9 @@
 #define ERR_VOL_READING                 15
 #define ERR_DRIVER_VERSION				16
 #define ERR_NEW_VERSION_REQUIRED		17
+#define ERR_CIPHER_INIT_FAILURE			18
+#define ERR_CIPHER_INIT_WEAK_KEY		19
+#define ERR_SELF_TESTS_FAILED			20
 
 #define ERR_VOL_ALREADY_MOUNTED         32
 #define ERR_NO_FREE_SLOTS               33
@@ -44,9 +59,16 @@
 #define ERR_VOL_MOUNT_FAILED            36
 #define ERR_INVALID_DEVICE              37
 #define ERR_ACCESS_DENIED               38
+#define ERR_MODE_INIT_FAILED            39
+
+#define ERR_DONT_REPORT                 100
 
 #define MIN_VOLUME_SIZE                 19456
-#define MAX_VOLUME_SIZE                 0x7fffFFFFffffFFFFI64
+#define MIN_HIDDEN_VOLUME_HOST_SIZE     ( MIN_VOLUME_SIZE * 2 + HIDDEN_VOL_HEADER_OFFSET + HEADER_SIZE )
+#define MAX_VOLUME_SIZE                 0x7fffFFFFffffFFFFLL
+#define MAX_FAT_VOLUME_SIZE				0xFFFFFFFE00LL		// Should be possible to increase up to 0x1FFFFFFFC00LL (untested)
+#define MAX_HIDDEN_VOLUME_HOST_SIZE     MAX_FAT_VOLUME_SIZE
+#define MAX_HIDDEN_VOLUME_SIZE          ( MAX_HIDDEN_VOLUME_HOST_SIZE - HIDDEN_VOL_HEADER_OFFSET - HEADER_SIZE )
 
 #define burn(mem,size) \
 	memset(mem,0xff,size); \
@@ -54,9 +76,10 @@
 
 #define WIDE(x) (LPWSTR)L##x
 
+#ifndef LINUX_DRIVER
 #include <string.h>
-
 #pragma intrinsic(memcmp, memcpy, memset, strcat, strcmp, strcpy, strlen)
+#endif
 
 #ifdef NT4_DRIVER
 
@@ -93,45 +116,6 @@
 
 #define DEVICE_DRIVER
 
-#endif				/* NT4_DRIVER */
-
-
-#ifdef WIN9X_DRIVER
-
-#pragma warning( disable : 4047 )
-
-#include "iosdcls.inc"		/* VMM and IOS headers */
-
-#pragma warning( default : 4047 )
-
-#include <vwin32.h>
-#include <winerror.h>
-#undef WANTVDXWRAPS
-#pragma warning( disable : 4229 )
-#include <shell.h>
-#pragma warning( default : 4229 )
-#pragma hdrstop
-#include <malloc.h>
-#include <vmm.h>
-#include "ifs.h"
-#include <dbt.h>
-#define MBYTE16 3967
-#define UWORD unsigned short
-#define UBYTE unsigned char
-
-#define MBYTE16 3967
-
-#define TCalloc(size) _PageAllocate(size % 4096 ? (size/4096)+1 : size/4096,\
-	PG_SYS,0,0,0,MBYTE16,NULL,PAGEZEROINIT|PAGEFIXED|PAGECONTIG|PAGEUSEALIGN);
-
-#define TCfree(memblock) _PageFree(memblock,0)
-
-#define DEVICE_DRIVER
-
-#endif				/* WIN9X_DRIVER */
-
-#ifdef DEVICE_DRIVER
-
 #ifndef BOOL
 typedef int BOOL;
 #endif
@@ -147,7 +131,7 @@ typedef int BOOL;
 /* Define dummies for the drivers */
 typedef int HFILE;
 typedef unsigned int WPARAM;
-typedef unsigned long LPARAM;
+typedef unsigned __int32 LPARAM;
 #define CALLBACK
 
 #ifndef UINT
@@ -155,14 +139,22 @@ typedef unsigned int UINT;
 #endif
 
 #ifndef LRESULT
-typedef unsigned long LRESULT;
+typedef unsigned __int32 LRESULT;
 #endif
+/* NT4_DRIVER */
+
+#elif defined(LINUX_DRIVER)	
+
+#define TCalloc(size) (kmalloc( size, GFP_KERNEL ))
+#define TCfree(memblock) kfree( memblock )
 
 #else
 
 #define TCalloc malloc
 #define TCfree free
 
+#ifdef _WIN32
+
 #pragma warning( disable : 4201 )
 #pragma warning( disable : 4214 )
 #pragma warning( disable : 4115 )
@@ -183,11 +175,21 @@ typedef unsigned long LRESULT;
 /* #pragma warning( default : 4514 ) this warning remains disabled */
 
 /* This is needed to fix a bug with VC 5, the TCHAR macro _ttoi64 maps
-   incorrectly to atoi64 when it should be _atoi64 */
+   incorrectly to atoLL when it should be _atoi64 */
 #define atoi64 _atoi64
 
-#endif				/* DEVICE_DRIVER */
+#endif				/* _WIN32 */
 
-typedef UINT (_stdcall * diskio_f) (int, void *, UINT);
+#endif				/* NT4_DRIVER */
+
+#ifdef _WIN32
 
 #pragma hdrstop
+
+#endif
+
+#ifdef MAX_PATH
+#define TC_MAX_PATH						MAX_PATH
+#else
+#define TC_MAX_PATH						260	/* Includes the null terminator */
+#endif