diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-08-05 23:04:01 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-08-06 00:04:25 +0200 |
| commit | 041024fbb96c4b56a948e26fe75d3115e13edf31 (patch) | |
| tree | dab147a3e4ea8e89e0a5acab8cc6866046fad8d2 /src/ExpandVolume | |
| parent | a23943694b715ecd4f5e7f6eb9c86b7f9a422851 (diff) | |
| download | VeraCrypt-041024fbb96c4b56a948e26fe75d3115e13edf31.tar.gz VeraCrypt-041024fbb96c4b56a948e26fe75d3115e13edf31.zip | |
Update license information to reflect the use of a dual license Apache 2.0 and TrueCrypt 3.0.
Diffstat (limited to 'src/ExpandVolume')
| -rw-r--r-- | src/ExpandVolume/DlgExpandVolume.cpp | 41 | ||||
| -rw-r--r-- | src/ExpandVolume/ExpandVolume.c | 48 | ||||
| -rw-r--r-- | src/ExpandVolume/ExpandVolume.h | 46 | ||||
| -rw-r--r-- | src/ExpandVolume/InitDataArea.c | 55 | ||||
| -rw-r--r-- | src/ExpandVolume/InitDataArea.h | 36 | ||||
| -rw-r--r-- | src/ExpandVolume/WinMain.cpp | 43 |
6 files changed, 85 insertions, 184 deletions
diff --git a/src/ExpandVolume/DlgExpandVolume.cpp b/src/ExpandVolume/DlgExpandVolume.cpp index 47b45966..1f623bef 100644 --- a/src/ExpandVolume/DlgExpandVolume.cpp +++ b/src/ExpandVolume/DlgExpandVolume.cpp @@ -1,32 +1,19 @@ /*
-
-Some portions of the source code contained in this file were derived from the
-source code of TrueCrypt 7.0a, which is governed by the TrueCrypt License 3.0
-that can be found in the file 'License.txt' in the folder 'TrueCrypt-License'.
-
-Modifications and additions to the original source code (contained in this file)
-and all other portions of this file are Copyright (c) 2009-2010 by Kih-Oskh or
-Copyright (c) 2012-2013 Josef Schneider <josef@netpage.dk>
-
-
-Some portions of the source code here are derived from 'Mount\Mount.c'
-
--------------------------------------------------------------------------------
-
-Original legal notice of the TrueCrypt source:
-
- Legal Notice: Some portions of the source code contained in this file were
- derived from the source code of Encryption for the Masses 2.02a, which is
- 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-2009 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 TrueCrypt binary and source
- code distribution packages.
-
-*/
+ Legal Notice: Some portions of the source code contained in this file were
+ derived from the source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2003-2012 TrueCrypt Developers Association and which is
+ governed by the TrueCrypt License 3.0, also from the source code of
+ Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux
+ and which is governed by the 'License Agreement for Encryption for the Masses'
+ and also from the source code of extcv, which is Copyright (c) 2009-2010 Kih-Oskh + or Copyright (c) 2012-2013 Josef Schneider <josef@netpage.dk>
+
+ Modifications and additions to the original source code (contained in this file)
+ and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and are governed by the Apache License 2.0 the full text of which is
+ contained in the file License.txt included in VeraCrypt binary and source
+ code distribution packages. */
#include "Tcdefs.h"
#include <time.h>
diff --git a/src/ExpandVolume/ExpandVolume.c b/src/ExpandVolume/ExpandVolume.c index a4fe5310..b978be4c 100644 --- a/src/ExpandVolume/ExpandVolume.c +++ b/src/ExpandVolume/ExpandVolume.c @@ -1,37 +1,19 @@ -/* - -Some portions of the source code contained in this file were derived from the -source code of TrueCrypt 7.0a, which is governed by the TrueCrypt License 3.0 -that can be found in the file 'License.txt' in the folder 'TrueCrypt-License'. - -Modifications and additions to the original source code (contained in this file) -and all other portions of this file are Copyright (c) 2009-2010 by Kih-Oskh or -Copyright (c) 2012-2013 Josef Schneider <josef@netpage.dk> - -TrueCrypt source files used to derive some portions of the source code in this -file are: - - - 'Mount\Mount.c' - - 'Common\Format.c' - - 'Common\Password.c' - - 'Format\Tcformat.c' - -------------------------------------------------------------------------------- - -Original legal notice of the TrueCrypt source files: - - Legal Notice: Some portions of the source code contained in this file were - derived from the source code of Encryption for the Masses 2.02a, which is - 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-2009 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 TrueCrypt binary and source - code distribution packages. - -*/ +/*
+ Legal Notice: Some portions of the source code contained in this file were
+ derived from the source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2003-2012 TrueCrypt Developers Association and which is
+ governed by the TrueCrypt License 3.0, also from the source code of
+ Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux
+ and which is governed by the 'License Agreement for Encryption for the Masses'
+ and also from the source code of extcv, which is Copyright (c) 2009-2010 Kih-Oskh + or Copyright (c) 2012-2013 Josef Schneider <josef@netpage.dk>
+
+ Modifications and additions to the original source code (contained in this file)
+ and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and are governed by the Apache License 2.0 the full text of which is
+ contained in the file License.txt included in VeraCrypt binary and source
+ code distribution packages. */ #include "Tcdefs.h" #include <time.h> diff --git a/src/ExpandVolume/ExpandVolume.h b/src/ExpandVolume/ExpandVolume.h index e5634eb7..3dc213f1 100644 --- a/src/ExpandVolume/ExpandVolume.h +++ b/src/ExpandVolume/ExpandVolume.h @@ -1,37 +1,19 @@ /* - -Some portions of the source code contained in this file were derived from the -source code of TrueCrypt 7.0a, which is governed by the TrueCrypt License 3.0 -that can be found in the file 'License.txt' in the folder 'TrueCrypt-License'. - -Modifications and additions to the original source code (contained in this file) -and all other portions of this file are Copyright (c) 2009-2010 by Kih-Oskh or -Copyright (c) 2012-2013 Josef Schneider <josef@netpage.dk> - -TrueCrypt source files used to derive some portions of the source code in this -file are: - - - 'Mount\Mount.c' - - 'Common\Format.c' - - 'Common\Password.c' - - 'Format\Tcformat.c' - -------------------------------------------------------------------------------- - -Original legal notice of the TrueCrypt source files: - - Legal Notice: Some portions of the source code contained in this file were - derived from the source code of Encryption for the Masses 2.02a, which is - 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-2009 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 TrueCrypt binary and source - code distribution packages. - -*/ + Legal Notice: Some portions of the source code contained in this file were + derived from the source code of TrueCrypt 7.1a, which is + Copyright (c) 2003-2012 TrueCrypt Developers Association and which is + governed by the TrueCrypt License 3.0, also from the source code of + Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux + and which is governed by the 'License Agreement for Encryption for the Masses' + and also from the source code of extcv, which is Copyright (c) 2009-2010 Kih-Oskh + or Copyright (c) 2012-2013 Josef Schneider <josef@netpage.dk> + + Modifications and additions to the original source code (contained in this file) + and all other portions of this file are Copyright (c) 2013-2015 IDRIX + and are governed by the Apache License 2.0 the full text of which is + contained in the file License.txt included in VeraCrypt binary and source + code distribution packages. */ #ifndef TC_HEADER_ExpandVolume #define TC_HEADER_ExpandVolume diff --git a/src/ExpandVolume/InitDataArea.c b/src/ExpandVolume/InitDataArea.c index c1eb6bd2..7a2a8725 100644 --- a/src/ExpandVolume/InitDataArea.c +++ b/src/ExpandVolume/InitDataArea.c @@ -1,45 +1,18 @@ -/* - -Most of the source code contained in this file is taken from the source code of -TrueCrypt 7.0a, which is governed by the TrueCrypt License 3.0 that can be found -in the file 'License.txt' in the folder 'TrueCrypt-License'. - -Modifications and additions to the original source code (contained in this file) -and all other portions of this file are Copyright (c) 2009-2010 by Kih-Oskh or -Copyright (c) 2012-2013 Josef Schneider <josef@netpage.dk> - - -Source code here is copied from 'Common/Format.c' with the following changes: - - - functions removed: - GetVolumeDataAreaSize (BOOL hiddenVolume, uint64 volumeSize) - TCFormatVolume (volatile FORMAT_VOL_PARAMETERS *volParams) - FormatNtfs (int driveNo, int clusterSize) - FormatExCallback (int command, DWORD subCommand, PVOID parameter) - - - variables removed: - volatile BOOLEAN FormatExResult; - - - removed static linkage class from StartFormatWriteThread() and - StopFormatWriteThread() - - - new functions: - SetFormatSectorSize(uint32 sector_size) - - -------------------------------------------------------------------------------- - -Original legal notice of the TrueCrypt source: - - Legal Notice: Some portions of the source code contained in this file were - derived from the source code of Encryption for the Masses 2.02a, which is - 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-2010 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 TrueCrypt binary and source +/*
+ Legal Notice: Some portions of the source code contained in this file were
+ derived from the source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2003-2012 TrueCrypt Developers Association and which is
+ governed by the TrueCrypt License 3.0, also from the source code of
+ Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux
+ and which is governed by the 'License Agreement for Encryption for the Masses'
+ and also from the source code of extcv, which is Copyright (c) 2009-2010 Kih-Oskh + or Copyright (c) 2012-2013 Josef Schneider <josef@netpage.dk>
+
+ Modifications and additions to the original source code (contained in this file)
+ and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and are governed by the Apache License 2.0 the full text of which is
+ contained in the file License.txt included in VeraCrypt binary and source
code distribution packages. */ #include <stdlib.h> #include <string.h> diff --git a/src/ExpandVolume/InitDataArea.h b/src/ExpandVolume/InitDataArea.h index 7b648e0e..bc72063c 100644 --- a/src/ExpandVolume/InitDataArea.h +++ b/src/ExpandVolume/InitDataArea.h @@ -1,27 +1,17 @@ -/* - -Most of the source code contained in this file is taken from the source code of -TrueCrypt 7.0a, which is governed by the TrueCrypt License 3.0 that can be found -in the file 'License.txt' in the folder 'TrueCrypt-License'. - -Modifications and additions to the original source code (contained in this file) -and all other portions of this file are Copyright (c) 2009-2010 by Kih-Oskh or -Copyright (c) 2012-2013 Josef Schneider <josef@netpage.dk> - -------------------------------------------------------------------------------- - -Original legal notice of the TrueCrypt source: - - Legal Notice: Some portions of the source code contained in this file were - derived from the source code of Encryption for the Masses 2.02a, which is - 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-2010 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 TrueCrypt binary and source - code distribution packages. */ +/*
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0, and also derived from source code of extcv which
+ is Copyright (c) 2009-2010 by Kih-Oskh or Copyright (c) 2012-2013 Josef Schneider
+ <josef@netpage.dk>
+
+ Modifications and additions to the original source code (contained in this file)
+ and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and are governed by the Apache License 2.0 the full text of which is
+ contained in the file License.txt included in VeraCrypt binary and source
+ code distribution packages.
+*/ #ifndef TC_HEADER_InitDataArea #define TC_HEADER_InitDataArea diff --git a/src/ExpandVolume/WinMain.cpp b/src/ExpandVolume/WinMain.cpp index ec7a6f56..6bf40477 100644 --- a/src/ExpandVolume/WinMain.cpp +++ b/src/ExpandVolume/WinMain.cpp @@ -1,32 +1,19 @@ -/* - -Most of the source code contained in this file is taken from the source code of -TrueCrypt 7.0a, which is governed by the TrueCrypt License 3.0 that can be found -in the file 'License.txt' in the folder 'TrueCrypt-License'. - -Modifications and additions to the original source code (contained in this file) -and all other portions of this file are Copyright (c) 2009-2010 by Kih-Oskh or -Copyright (c) 2012-2013 Josef Schneider <josef@netpage.dk> - - -Source code in this file is derived from 'Mount\Mount.c' - -------------------------------------------------------------------------------- - -Original legal notice of the TrueCrypt source: - - Legal Notice: Some portions of the source code contained in this file were - derived from the source code of Encryption for the Masses 2.02a, which is - 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-2009 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 TrueCrypt binary and source - code distribution packages. - -*/ +/*
+ Legal Notice: Some portions of the source code contained in this file were
+ derived from the source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2003-2012 TrueCrypt Developers Association and which is
+ governed by the TrueCrypt License 3.0, also from the source code of
+ Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux
+ and which is governed by the 'License Agreement for Encryption for the Masses'
+ and also from the source code of extcv, which is Copyright (c) 2009-2010 Kih-Oskh + or Copyright (c) 2012-2013 Josef Schneider <josef@netpage.dk>
+
+ Modifications and additions to the original source code (contained in this file)
+ and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and are governed by the Apache License 2.0 the full text of which is
+ contained in the file License.txt included in VeraCrypt binary and source
+ code distribution packages. */ #include "Tcdefs.h" #include <time.h> |