mirror of
https://github.com/veracrypt/VeraCrypt.git
synced 2026-08-29 04:07:37 +00:00
Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
52c6cad745 | ||
|
|
a8fecdcbb7 | ||
|
|
1c419739a2 | ||
|
|
593d1a3edc | ||
|
|
0f70b56942 |
+3
-3
@@ -15,13 +15,13 @@
|
||||
#define TC_APP_NAME "VeraCrypt"
|
||||
|
||||
// Version displayed to user
|
||||
#define VERSION_STRING "1.0a"
|
||||
#define VERSION_STRING "1.0b"
|
||||
|
||||
// Version number to compare against driver
|
||||
#define VERSION_NUM 0x010a
|
||||
#define VERSION_NUM 0x010b
|
||||
|
||||
// Release date
|
||||
#define TC_STR_RELEASE_DATE "June 22, 2013"
|
||||
#define TC_STR_RELEASE_DATE "June 26, 2013"
|
||||
#define TC_RELEASE_DATE_YEAR 2013
|
||||
#define TC_RELEASE_DATE_MONTH 6
|
||||
|
||||
|
||||
@@ -422,7 +422,7 @@ KeyReady: ;
|
||||
|
||||
// Required program version
|
||||
cryptoInfo->RequiredProgramVersion = GetHeaderField16 (header, TC_HEADER_OFFSET_REQUIRED_VERSION);
|
||||
cryptoInfo->LegacyVolume = cryptoInfo->RequiredProgramVersion < 0x600;
|
||||
cryptoInfo->LegacyVolume = cryptoInfo->RequiredProgramVersion < 0x10b;
|
||||
|
||||
// Check CRC of the key set
|
||||
if (!ReadVolumeHeaderRecoveryMode
|
||||
|
||||
+2
-3
@@ -70,7 +70,7 @@ void RMD160Update (RMD160_CTX *ctx, const unsigned char *input, unsigned __int32
|
||||
#ifndef TC_WINDOWS_BOOT
|
||||
uint64 len = lenArg, have, need;
|
||||
#else
|
||||
uint16 len = (uint16) lenArg, have, need;
|
||||
uint32 len = lenArg, have, need;
|
||||
#endif
|
||||
|
||||
/* Check how many bytes we already have and how many more we need. */
|
||||
@@ -117,8 +117,7 @@ static void RMD160Pad(RMD160_CTX *ctx)
|
||||
PUT_64BIT_LE(count, ctx->count);
|
||||
#else
|
||||
*(uint32 *) (count + 4) = 0;
|
||||
*(uint16 *) (count + 2) = 0;
|
||||
*(uint16 *) (count + 0) = ctx->count;
|
||||
*(uint32 *) (count + 0) = ctx->count;
|
||||
#endif
|
||||
|
||||
/* Pad out to 56 mod 64. */
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@ typedef struct RMD160Context
|
||||
#ifndef TC_WINDOWS_BOOT
|
||||
uint64 count;
|
||||
#else
|
||||
uint16 count;
|
||||
uint32 count;
|
||||
#endif
|
||||
unsigned char buffer[RIPEMD160_BLOCK_LENGTH];
|
||||
} RMD160_CTX;
|
||||
|
||||
@@ -27,8 +27,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
||||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 7,1,1,0
|
||||
PRODUCTVERSION 7,1,1,0
|
||||
FILEVERSION 1,0,2,0
|
||||
PRODUCTVERSION 1,0,2,0
|
||||
FILEFLAGSMASK 0x17L
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
@@ -45,11 +45,11 @@ BEGIN
|
||||
BEGIN
|
||||
VALUE "CompanyName", "IDRIX"
|
||||
VALUE "FileDescription", "VeraCrypt Driver"
|
||||
VALUE "FileVersion", "1.10"
|
||||
VALUE "FileVersion", "1.11"
|
||||
VALUE "LegalTrademarks", "VeraCrypt"
|
||||
VALUE "OriginalFilename", "veracrypt.sys"
|
||||
VALUE "ProductName", "VeraCrypt"
|
||||
VALUE "ProductVersion", "1.0a"
|
||||
VALUE "ProductVersion", "1.0b"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
||||
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
||||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 7,1,1,0
|
||||
PRODUCTVERSION 7,1,1,0
|
||||
FILEVERSION 1,0,2,0
|
||||
PRODUCTVERSION 1,0,2,0
|
||||
FILEFLAGSMASK 0x17L
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
@@ -46,11 +46,11 @@ BEGIN
|
||||
BEGIN
|
||||
VALUE "CompanyName", "IDRIX"
|
||||
VALUE "FileDescription", "VeraCrypt Format"
|
||||
VALUE "FileVersion", "1.0a"
|
||||
VALUE "FileVersion", "1.0b"
|
||||
VALUE "LegalTrademarks", "VeraCrypt"
|
||||
VALUE "OriginalFilename", "VeraCrypt Format.exe"
|
||||
VALUE "ProductName", "VeraCrypt"
|
||||
VALUE "ProductVersion", "1.0a"
|
||||
VALUE "ProductVersion", "1.0b"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
||||
+4
-4
@@ -421,8 +421,8 @@ END
|
||||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 7,1,1,0
|
||||
PRODUCTVERSION 7,1,1,0
|
||||
FILEVERSION 1,0,2,0
|
||||
PRODUCTVERSION 1,0,2,0
|
||||
FILEFLAGSMASK 0x17L
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
@@ -439,11 +439,11 @@ BEGIN
|
||||
BEGIN
|
||||
VALUE "CompanyName", "IDRIX"
|
||||
VALUE "FileDescription", "VeraCrypt"
|
||||
VALUE "FileVersion", "1.0a"
|
||||
VALUE "FileVersion", "1.0b"
|
||||
VALUE "LegalTrademarks", "VeraCrypt"
|
||||
VALUE "OriginalFilename", "VeraCrypt.exe"
|
||||
VALUE "ProductName", "VeraCrypt"
|
||||
VALUE "ProductVersion", "1.0a"
|
||||
VALUE "ProductVersion", "1.0b"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
||||
+35
-24
@@ -9,7 +9,7 @@ agree to the license terms contained in the file 'License.txt', which is
|
||||
included in this archive.
|
||||
|
||||
Note that the license specifies, for example, that a derived work must not be
|
||||
called 'TrueCrypt'.
|
||||
called 'TrueCrypt' or 'VeraCrypt'
|
||||
|
||||
|
||||
|
||||
@@ -17,12 +17,13 @@ Contents
|
||||
========
|
||||
|
||||
I. Windows
|
||||
Requirements for Building TrueCrypt for Windows
|
||||
Instructions for Building TrueCrypt for Windows
|
||||
Requirements for Building VeraCrypt for Windows
|
||||
Instructions for Building VeraCrypt for Windows
|
||||
Instructions for Signing and Packaging VeraCrypt for Windows
|
||||
|
||||
II. Linux and Mac OS X
|
||||
Requirements for Building TrueCrypt for Linux and Mac OS X
|
||||
Instructions for Building TrueCrypt for Linux and Mac OS X
|
||||
Requirements for Building VeraCrypt for Linux and Mac OS X
|
||||
Instructions for Building VeraCrypt for Linux and Mac OS X
|
||||
|
||||
III. FreeBSD and OpenSolaris
|
||||
|
||||
@@ -37,7 +38,7 @@ VI. Further Information
|
||||
I. Windows
|
||||
==========
|
||||
|
||||
Requirements for Building TrueCrypt for Windows:
|
||||
Requirements for Building VeraCrypt for Windows:
|
||||
------------------------------------------------
|
||||
|
||||
- Microsoft Visual C++ 2008 SP1 (Professional Edition or compatible)
|
||||
@@ -53,14 +54,14 @@ IMPORTANT:
|
||||
|
||||
The 64-bit editions of Windows Vista and later versions of Windows, and in
|
||||
some cases (e.g. playback of HD DVD content) also the 32-bit editions, do not
|
||||
allow the TrueCrypt driver to run without an appropriate digital signature.
|
||||
Therefore, all .sys files in official TrueCrypt binary packages are digitally
|
||||
signed with the digital certificate of the TrueCrypt Foundation, which was
|
||||
issued by a certification authority. At the end of each official .exe and
|
||||
allow the VeraCrypt driver to run without an appropriate digital signature.
|
||||
Therefore, all .sys files in official VeraCrypt binary packages are digitally
|
||||
signed with the digital certificate of the IDRIX, which was
|
||||
issued by Thawt certification authority. At the end of each official .exe and
|
||||
.sys file, there are embedded digital signatures and all related certificates
|
||||
(i.e. all certificates in the relevant certification chain, such as the
|
||||
certification authority certificates, CA-MS cross-certificate, and the
|
||||
TrueCrypt Foundation certificate). Keep this in mind if you compile TrueCrypt
|
||||
IDRIX certificate). Keep this in mind if you compile VeraCrypt
|
||||
and compare your binaries with the official binaries. If your binaries are
|
||||
unsigned, the sizes of the official binaries will usually be approximately
|
||||
10 KB greater than sizes of your binaries (there may be further differences
|
||||
@@ -69,7 +70,7 @@ or no service pack for Visual Studio, or different hotfixes for it, or if you
|
||||
use different versions of the required SDKs).
|
||||
|
||||
|
||||
Instructions for Building TrueCrypt for Windows:
|
||||
Instructions for Building VeraCrypt for Windows:
|
||||
------------------------------------------------
|
||||
|
||||
1) Create an environment variable 'MSVC16_ROOT' pointing to the folder 'MSVC15'
|
||||
@@ -78,7 +79,7 @@ Instructions for Building TrueCrypt for Windows:
|
||||
Note: The 16-bit installer MSVC15\SETUP.EXE cannot be run on 64-bit Windows,
|
||||
but it is actually not necessary to run it. You only need to extract the
|
||||
folder 'MSVC15', which contains the 32-bit binaries required to build the
|
||||
TrueCrypt Boot Loader.
|
||||
VeraCrypt Boot Loader.
|
||||
|
||||
2) If you have installed the Windows Driver Development Kit in another
|
||||
directory than '%SYSTEMDRIVE%\WinDDK', create an environment variable
|
||||
@@ -88,21 +89,31 @@ Instructions for Building TrueCrypt for Windows:
|
||||
environment variable 'PKCS11_INC' pointing to the directory where
|
||||
the PKCS #11 header files are installed.
|
||||
|
||||
4) Open the solution file 'TrueCrypt.sln' in Microsoft Visual Studio 2008.
|
||||
4) Open the solution file 'VeraCrypt.sln' in Microsoft Visual Studio 2008.
|
||||
|
||||
5) Select 'All' as the active solution configuration.
|
||||
|
||||
6) Build the solution.
|
||||
|
||||
7) If successful, there should be newly built TrueCrypt binaries in the
|
||||
7) If successful, there should be newly built VeraCrypt binaries in the
|
||||
'Release' folder.
|
||||
|
||||
Instructions for Signing VeraCrypt for Windows:
|
||||
------------------------------------------------
|
||||
|
||||
The folder "Signing" contains a batch file (sign.bat) that will sign all
|
||||
VeraCrypt components using a code signing certificate present on the
|
||||
certificate store and also build the final installation setup.
|
||||
The batch file suppose that the code signing certificate is issued by Thawt.
|
||||
This is the case for IDRIX's certificate. If yours is issued by another CA,
|
||||
then you should put the Root and Intermediate certificates in the "Signing"
|
||||
folder and then modify sign.bat accordingly.
|
||||
|
||||
|
||||
II. Linux and Mac OS X
|
||||
======================
|
||||
|
||||
Requirements for Building TrueCrypt for Linux and Mac OS X:
|
||||
Requirements for Building VeraCrypt for Linux and Mac OS X:
|
||||
-----------------------------------------------------------
|
||||
|
||||
- GNU Make
|
||||
@@ -120,13 +131,13 @@ Requirements for Building TrueCrypt for Linux and Mac OS X:
|
||||
environment variable 'PKCS11_INC'.
|
||||
|
||||
|
||||
Instructions for Building TrueCrypt for Linux and Mac OS X:
|
||||
Instructions for Building VeraCrypt for Linux and Mac OS X:
|
||||
-----------------------------------------------------------
|
||||
|
||||
1) Change the current directory to the root of the TrueCrypt source code.
|
||||
1) Change the current directory to the root of the VeraCrypt source code.
|
||||
|
||||
2) If you have no wxWidgets shared library installed, run the following
|
||||
command to configure the wxWidgets static library for TrueCrypt and to
|
||||
command to configure the wxWidgets static library for VeraCrypt and to
|
||||
build it:
|
||||
|
||||
$ make WX_ROOT=/usr/src/wxWidgets wxbuild
|
||||
@@ -135,7 +146,7 @@ Instructions for Building TrueCrypt for Linux and Mac OS X:
|
||||
wxWidgets library. Output files will be placed in the './wxrelease/'
|
||||
directory.
|
||||
|
||||
3) To build TrueCrypt, run the following command:
|
||||
3) To build VeraCrypt, run the following command:
|
||||
|
||||
$ make
|
||||
|
||||
@@ -143,7 +154,7 @@ Instructions for Building TrueCrypt for Linux and Mac OS X:
|
||||
|
||||
$ make WXSTATIC=1
|
||||
|
||||
4) If successful, the TrueCrypt executable should be located in the directory
|
||||
4) If successful, the VeraCrypt executable should be located in the directory
|
||||
'Main'.
|
||||
|
||||
By default, a universal executable supporting both graphical and text user
|
||||
@@ -174,7 +185,7 @@ If you intend to implement a feature, please contact us first to make sure:
|
||||
3) Whether we need help of third-party developers with implementing the feature.
|
||||
|
||||
Information on how to contact us can be found at:
|
||||
http://www.truecrypt.org/contact
|
||||
https://veracrypt.codeplex.com/
|
||||
|
||||
|
||||
|
||||
@@ -185,7 +196,7 @@ Copyright Information
|
||||
---------------------
|
||||
|
||||
This software as a whole:
|
||||
Copyright (c) 2012 TrueCrypt Developers Association. All rights reserved.
|
||||
Copyright (c) 2013 IDRIX. All rights reserved.
|
||||
|
||||
Portions of this software:
|
||||
Copyright (c) 2003-2012 TrueCrypt Developers Association. All rights reserved.
|
||||
@@ -206,4 +217,4 @@ documentation, are the sole property of their respective owners.
|
||||
VI. Further Information
|
||||
=======================
|
||||
|
||||
http://www.truecrypt.org
|
||||
http://www.idrix.fr
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
Copyright (c) 1998-2000 Paul Le Roux and which is governed by the 'License
|
||||
Agreement for Encryption for the Masses'. Modifications and additions to
|
||||
the original source code (contained in this file) and all other portions
|
||||
of this file are Copyright (c) 2003-2012 VeraCrypt Developers Association
|
||||
of this file are Copyright (c) 2003-2012 TrueCrypt Developers Association
|
||||
and are governed by the TrueCrypt License 3.0 the full text of which is
|
||||
contained in the file License.txt included in VeraCrypt binary and source
|
||||
code distribution packages. */
|
||||
|
||||
+4
-4
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
||||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 7,1,1,0
|
||||
PRODUCTVERSION 7,1,1,0
|
||||
FILEVERSION 1,0,2,0
|
||||
PRODUCTVERSION 1,0,2,0
|
||||
FILEFLAGSMASK 0x17L
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
@@ -46,11 +46,11 @@ BEGIN
|
||||
BEGIN
|
||||
VALUE "CompanyName", "IDRIX"
|
||||
VALUE "FileDescription", "VeraCrypt Setup"
|
||||
VALUE "FileVersion", "1.0a"
|
||||
VALUE "FileVersion", "1.0b"
|
||||
VALUE "LegalTrademarks", "VeraCrypt"
|
||||
VALUE "OriginalFilename", "VeraCrypt Setup.exe"
|
||||
VALUE "ProductName", "VeraCrypt"
|
||||
VALUE "ProductVersion", "1.0a"
|
||||
VALUE "ProductVersion", "1.0b"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
||||
@@ -12,6 +12,6 @@ cd "..\Release\Setup Files\"
|
||||
|
||||
cd "..\..\Signing"
|
||||
|
||||
signtool sign /v /a /ac Thawt_CodeSigning_CA.crt /t http://timestamp.verisign.com/scripts/timestamp.dll "..\Release\Setup Files\VeraCrypt Setup 1.0a.exe"
|
||||
signtool sign /v /a /ac Thawt_CodeSigning_CA.crt /t http://timestamp.verisign.com/scripts/timestamp.dll "..\Release\Setup Files\VeraCrypt Setup 1.0b.exe"
|
||||
|
||||
pause
|
||||
Reference in New Issue
Block a user