TrueCrypt Source Version 2.0

Common/APIDRVR.H

@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 TrueCrypt Team, truecrypt.org
+/* Copyright (C) 2004 TrueCrypt Foundation
    This product uses components written by Paul Le Roux <[email protected]> */
 
 /* DeviceIoControl values.

Common/CACHE.C

@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 TrueCrypt Team, truecrypt.org
+/* Copyright (C) 2004 TrueCrypt Foundation
    This product uses components written by Paul Le Roux <[email protected]> */
 
 #include "tcdefs.h"

Common/CACHE.H

@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 TrueCrypt Team, truecrypt.org
+/* Copyright (C) 2004 TrueCrypt Foundation
    This product uses components written by Paul Le Roux <[email protected]> */
 
 extern char szDriverPassword[4][MAX_PASSWORD + 1];

Common/CMDLINE.C

@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 TrueCrypt Team, truecrypt.org
+/* Copyright (C) 2004 TrueCrypt Foundation
    This product uses components written by Paul Le Roux <[email protected]> */
 
 #include "TCdefs.h"

Common/CMDLINE.H

@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 TrueCrypt Team, truecrypt.org
+/* Copyright (C) 2004 TrueCrypt Foundation
    This product uses components written by Paul Le Roux <[email protected]> */
 
 #define HAS_ARGUMENT	1

Common/COMBO.C

@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 TrueCrypt Team, truecrypt.org
+/* Copyright (C) 2004 TrueCrypt Foundation
    This product uses components written by Paul Le Roux <[email protected]> */
 
 #include "TCdefs.h"

Common/COMBO.H

@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 TrueCrypt Team, truecrypt.org
+/* Copyright (C) 2004 TrueCrypt Foundation
    This product uses components written by Paul Le Roux <[email protected]> */
 
 

Common/CRC.C

@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 TrueCrypt Team, truecrypt.org
+/* Copyright (C) 2004 TrueCrypt Foundation
    This product uses components written by Paul Le Roux <[email protected]> */
 
 #include "TCdefs.h"

Common/CRC.H

@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 TrueCrypt Team, truecrypt.org
+/* Copyright (C) 2004 TrueCrypt Foundation
    This product uses components written by Paul Le Roux <[email protected]> */
 
 extern unsigned long crc_32_tab[];

Common/CRYPTO.C

@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 TrueCrypt Team, truecrypt.org
+/* Copyright (C) 2004 TrueCrypt Foundation
    This product uses components written by Paul Le Roux <[email protected]> */
 
 #include "TCdefs.h"
@@ -10,6 +10,10 @@ crypto_open ()
 {
 	/* Do the crt allocation */
 	PCRYPTO_INFO cryptoInfo = TCalloc (sizeof (CRYPTO_INFO));
+#ifndef DEVICE_DRIVER
+	VirtualLock (cryptoInfo, sizeof (CRYPTO_INFO));
+#endif
+
 	if (cryptoInfo == NULL)
 		return NULL;
 
@@ -29,14 +33,19 @@ void
 crypto_close (PCRYPTO_INFO cryptoInfo)
 {
 	burn (cryptoInfo, sizeof (CRYPTO_INFO));
+#ifndef DEVICE_DRIVER
+	VirtualUnlock (cryptoInfo, sizeof (CRYPTO_INFO));
+#endif
 	TCfree (cryptoInfo);
 }
 
 int
 get_block_size (int cipher)
 {
-	if (cipher);		/* remove warning */
-	return 8;
+	if (cipher == AES)
+		return 16;
+	else
+		return 8;
 }
 
 int
@@ -48,6 +57,8 @@ get_key_size (int cipher)
 		return 16;
 	else if (cipher == BLOWFISH)
 		return 56;
+	else if (cipher == AES)
+		return 32;
 	else if (cipher == TRIPLEDES)
 		return 21;
 	else if (cipher == CAST)
@@ -63,6 +74,8 @@ get_cipher_name (int cipher)
 {
 	if (cipher == BLOWFISH)
 		return "Blowfish";
+	if (cipher == AES)
+		return "AES";
 	else if (cipher == IDEA)
 		return "IDEA";
 	else if (cipher == DES56)

Common/CRYPTO.H

@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 TrueCrypt Team, truecrypt.org
+/* Copyright (C) 2004 TrueCrypt Foundation
    This product uses components written by Paul Le Roux <[email protected]> */
 
 
@@ -34,12 +34,13 @@
 /* The encryption algorithm ID  */
 #define NONE				0
 #define BLOWFISH			1
-#define CAST				2
-#define IDEA				3
-#define TRIPLEDES			4
+#define AES					2
+#define CAST				3
+#define IDEA				4
+#define TRIPLEDES			5
 #define DES56				100			// Used only for DES test vectors
 
-#define LAST_CIPHER_ID		4			// Last cipher used for volume encryption
+#define LAST_CIPHER_ID		5			// Last cipher used for volume encryption
 
 // Length in bytes of the longest key used by encryption algorithms
 #define	MAX_CIPHER_KEY		56			// Blowfish 448 bits
@@ -49,12 +50,14 @@
 #define DES_KS				128
 #define TRIPLEDES_KS		(DES_KS*3)
 #define BLOWFISH_KS			4168
+#define AES_KS				240
 #define CAST_KS				128
 
 #define MAX_EXPANDED_KEY		4168
 
 #include "des.h"
 #include "blowfish.h"
+#include "aes.h"
 #include "idea.h"
 #include "sha.h"
 #include "sha1.h"
@@ -95,6 +98,7 @@ typedef struct CRYPTO_INFO_t
 #define decipher_block(cipher, data, ks) \
 {\
 	if (cipher == BLOWFISH) BF_decrypt ((void *) data, (void *) ks); \
+	else if (cipher == AES) aes_decrypt ((void *) data, (void *) data, (void *)((char *)(ks)+sizeof(aes_encrypt_ctx))); \
 	else if (cipher == IDEA) ideaCrypt ((void *) data,(void *)  data, (void *) ((char *) ks + IDEA_KS)); \
 	else if (cipher == DES56) des_encrypt ((void *) data, (void *) ks, 0); \
 	else if (cipher == CAST) CAST_ecb_encrypt((void *) data,(void *) data,(void*)ks,0);  \
@@ -105,6 +109,7 @@ typedef struct CRYPTO_INFO_t
 #define encipher_block(cipher, data, ks) \
 {\
 	if (cipher == BLOWFISH) BF_encrypt ((void *) data, (void *) ks); \
+	else if (cipher == AES) aes_encrypt ((void *) data, (void *) data, (void *) ks); \
 	else if (cipher == IDEA) ideaCrypt ((void *) data, (void *) data, (void *) ks); \
 	else if (cipher == DES56) des_encrypt ((void *) data, (void *) ks, 1); \
 	else if (cipher == CAST) CAST_ecb_encrypt((void *) data,(void *) data,(void*)ks,1);  \
@@ -115,6 +120,7 @@ typedef struct CRYPTO_INFO_t
 #define init_cipher(cipher, key, ks) \
 {\
 	if (cipher == BLOWFISH) BF_set_key ((void*)ks, 56, (void*) (key)); \
+	else if (cipher == AES) {aes_encrypt_key((void*)(key), 32, (void*)ks); aes_decrypt_key((void*)(key), 32, (void*)((char *)(ks)+sizeof(aes_encrypt_ctx)));} \
 	else if (cipher == IDEA) ideaExpandKey ((void*) (key), (void*)ks, (void *) ((char *) ks + IDEA_KS)); \
 	else if (cipher == DES56) des_key_sched ((void*) (key), (void*)ks); \
 	else if (cipher == CAST) CAST_set_key((void*)ks, 16, (void*)(key)); \
@@ -125,13 +131,6 @@ typedef struct CRYPTO_INFO_t
 	} \
 }
 
-#define is_valid_tc_cipher(cipher) \
-	(cipher == BLOWFISH || \
-	 cipher == IDEA || \
-	cipher == DES56 || \
-	cipher == CAST || \
-	cipher == TRIPLEDES)
-
 
 PCRYPTO_INFO crypto_open (void);
 void crypto_loadkey (PKEY_INFO keyInfo, char *lpszUserKey, int nUserKeyLen);

Common/Common.rc

@@ -34,13 +34,12 @@ CLASS "SplashDlg"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,121,178,50,14
-    LTEXT           "Copyright � 2004 TrueCrypt Team",IDT_ABOUT_COPYRIGHT,18,
-                    71,154,8
+    LTEXT           "Copyright � 2004 TrueCrypt Foundation",
+                    IDT_ABOUT_COPYRIGHT,18,71,207,8
     LTEXT           "Based on E4M by Paul Le Roux.",IDC_STATIC,18,114,104,8
     LTEXT           "Portions of this software are based in part on the works of the following people:",
                     IDC_STATIC,18,122,256,8
-    LTEXT           "Contact: [email protected]",IDT_ABOUT_MAILTO,185,87,
-                    104,8
+    LTEXT           "Contact: ",IDT_ABOUT_MAILTO,185,87,104,8,NOT WS_VISIBLE
     LTEXT           "Bruce Schneier, Eric Young, Peter Gutmann, Xuejia Lai, James Massey,",
                     IDC_STATIC,18,130,226,8
     LTEXT           "Walt Tuchmann, Whitfield Diffie, Martin Hellman, Don Coppersmith,",
@@ -54,7 +53,7 @@ BEGIN
                     WS_EX_STATICEDGE
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,1,169,291,1,
                     WS_EX_STATICEDGE
-    LTEXT           "www.truecrypt.org",ID_WEBSITE,18,87,79,8,SS_NOTIFY
+    LTEXT           "www.google.com",ID_WEBSITE,18,87,79,8,SS_NOTIFY
 END
 
 IDD_COMMANDHELP_DLG DIALOGEX 0, 0, 272, 146
@@ -239,7 +238,7 @@ STRINGTABLE
 BEGIN
     IDS_DRIVER_VERSION      "This program requires version %s of the TrueCrypt driver. Please reinstall the software."
     IDS_NEW_VERSION_REQUIRED 
-                            "This volume requires a new version of TrueCrypt.\nNew version is available at http://www.truecrypt.org"
+                            "This volume requires a new version of TrueCrypt."
 END
 
 #endif    // English (U.S.) resources

Common/DISMOUNT.C

@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 TrueCrypt Team, truecrypt.org
+/* Copyright (C) 2004 TrueCrypt Foundation
    This product uses components written by Paul Le Roux <[email protected]> */
 
 /* WARNING: The code for unmounting volumes is ugly for all Windows versions;

Common/DISMOUNT.H

@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 TrueCrypt Team, truecrypt.org
+/* Copyright (C) 2004 TrueCrypt Foundation
    This product uses components written by Paul Le Roux <[email protected]> */
 
 /* Everything below this line is automatically updated by the -mkproto-tool- */

Common/DLGCODE.C

@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 TrueCrypt Team, truecrypt.org
+/* Copyright (C) 2004 TrueCrypt Foundation
    This product uses components written by Paul Le Roux <[email protected]> */
 
 #include "TCdefs.h"
@@ -283,7 +283,7 @@ AboutDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 		if (lw == ID_WEBSITE)
 		{
 			ArrowWaitCursor ();
-			ShellExecute (NULL, "open", "http://www.truecrypt.org", NULL, NULL, SW_SHOWNORMAL);
+			ShellExecute (NULL, "open", "http://www.google.com/search?q=truecrypt", NULL, NULL, SW_SHOWNORMAL);
 			Sleep (200);
 			NormalCursor ();
 			return 1;
@@ -1035,23 +1035,19 @@ GetAvailableFixedDisks (HWND hComboBox, char *lpszRootPath)
 				LvItem.pszText=item2;
 				SendMessage(hComboBox,LVM_SETITEM,0,(LPARAM)&LvItem); 
 			}
-			else
-			{
-				if(drivePresent)
-				{
-					LVITEM LvItem;
-					memset(&LvItem,0,sizeof(LvItem));
-					LvItem.mask=LVIF_TEXT;   
-					LvItem.iItem= line++;   
 
-					LvItem.pszText="";
-					SendMessage(hComboBox,LVM_INSERTITEM,0,(LPARAM)&LvItem);
-				}
 
-				if (n == 1)
-					i = 64;
-				break;
-			}
+		}
+
+		if(drivePresent)
+		{
+			LVITEM LvItem;
+			memset(&LvItem,0,sizeof(LvItem));
+			LvItem.mask=LVIF_TEXT;   
+			LvItem.iItem= line++;   
+
+			LvItem.pszText="";
+			SendMessage(hComboBox,LVM_INSERTITEM,0,(LPARAM)&LvItem);
 		}
 	}
 

Common/DLGCODE.H

@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 TrueCrypt Team, truecrypt.org
+/* Copyright (C) 2004 TrueCrypt Foundation
    This product uses components written by Paul Le Roux <[email protected]> */
 
 #define IDC_ABOUT 0x7fff	/* ID for AboutBox on system menu in wm_user

Common/ENDIAN.C

@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 TrueCrypt Team, truecrypt.org
+/* Copyright (C) 2004 TrueCrypt Foundation
    This product uses components written by Paul Le Roux <[email protected]> */
 
 #include "TCdefs.h"

Common/ENDIAN.H

@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 TrueCrypt Team, truecrypt.org
+/* Copyright (C) 2004 TrueCrypt Foundation
    This product uses components written by Paul Le Roux <[email protected]> */
 
 #define mputLong(memPtr,data) \

Common/FAT.C

@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 TrueCrypt Team, truecrypt.org
+/* Copyright (C) 2004 TrueCrypt Foundation
    This product uses components written by Paul Le Roux <[email protected]> */
 
 #include "TCdefs.h"
@@ -394,8 +394,8 @@ Format (fatparams * ft, HFILE dev, PCRYPTO_INFO cryptoInfo, int nFrequency, disk
 
 		// Generate a random key and IV to randomize data area
 		// and support a possible hidden volume
-		RandgetBytes (key, MAX_CIPHER_KEY); 
-		RandgetBytes (cryptoInfo->iv, sizeof cryptoInfo->iv); 
+		RandgetBytes (key, MAX_CIPHER_KEY, FALSE); 
+		RandgetBytes (cryptoInfo->iv, sizeof cryptoInfo->iv, FALSE); 
 		init_cipher (cryptoInfo->cipher, key, cryptoInfo->ks);
 		ZeroMemory (sector, 512); 
 

Common/FAT.H

@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 TrueCrypt Team, truecrypt.org
+/* Copyright (C) 2004 TrueCrypt Foundation
    This product uses components written by Paul Le Roux <[email protected]> */
 
 typedef struct fatparams_t

Common/FORMAT.C

@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 TrueCrypt Team, truecrypt.org
+/* Copyright (C) 2004 TrueCrypt Foundation
    This product uses components written by Paul Le Roux <[email protected]> */
 
 #include "TCdefs.h"
@@ -71,19 +71,13 @@ FormatVolume (char *lpszFilename,
 	ft->num_sectors = (int) (size / SECTOR_SIZE);
 	memcpy (ft->volume_name, "           ", 11);
 
-	{
-		// Avoid random init delay before time counters start
-		char tmp[1];
-		RandgetBytes(&tmp, 1);
-	}
-
-	InitProgressBar (ft->num_sectors);
-
 	/* Calculate the fats, root dir etc, and update ft */
 	GetFatParams (ft);
 
 	/* Copies any header structures into ft->header, but does not do any
 	   disk io */
+	VirtualLock (&ft->header, sizeof (ft->header));
+
 	nStatus = VolumeWriteHeader (ft->header,
 				     cipher,
 				     lpszPassword,
@@ -92,11 +86,15 @@ FormatVolume (char *lpszFilename,
 					 0,
 				     &cryptoInfo);
 
+	VirtualUnlock (&ft->header, sizeof (ft->header));
+
 	if (nStatus != 0)
 		return nStatus;
 
 	KillTimer (hwndDlg, 0xff);
 
+	InitProgressBar (ft->num_sectors);
+
 	/* This does the disk io, both copying out the header, init the
 	   sectors, and writing the FAT tables etc */
 	nStatus = Format (ft, (HFILE) dev, cryptoInfo, 1000, write, bDevice==TRUE ? quickFormat:FALSE);

Common/FORMAT.H

@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 TrueCrypt Team, truecrypt.org
+/* Copyright (C) 2004 TrueCrypt Foundation
    This product uses components written by Paul Le Roux <[email protected]> */
 
 /* Everything below this line is automatically updated by the -mkproto-tool- */

Common/PASSWORD.C

@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 TrueCrypt Team, truecrypt.org
+/* Copyright (C) 2004 TrueCrypt Foundation
    This product uses components written by Paul Le Roux <[email protected]> */
 
 #include "TCdefs.h"

Common/PASSWORD.H

@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 TrueCrypt Team, truecrypt.org
+/* Copyright (C) 2004 TrueCrypt Foundation
    This product uses components written by Paul Le Roux <[email protected]> */
 
 

Common/PKCS5.C

@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 TrueCrypt Team, truecrypt.org
+/* Copyright (C) 2004 TrueCrypt Foundation
    This product uses components written by Paul Le Roux <[email protected]> */
 
 #include "TCdefs.h"

Common/PKCS5.H

@@ -1,4 +1,4 @@
-/* Copyright (C) 2004 TrueCrypt Team, truecrypt.org
+/* Copyright (C) 2004 TrueCrypt Foundation
    This product uses components written by Paul Le Roux <[email protected]> */