11 files changed, 291 insertions, 69 deletions
diff --git a/src/Setup/ComSetup.cpp b/src/Setup/ComSetup.cpp
index 43262198..96bf42b4 100644
--- a/src/Setup/ComSetup.cpp
+++ b/src/Setup/ComSetup.cpp
@@ -1,10 +1,14 @@
 /*
- Copyright (c) 2007-2010 TrueCrypt Developers Association. All rights reserved.
-
- 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.
+
+ 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.
 */
 
 #define TC_MAIN_COM_VERSION_MAJOR 2
 #define TC_MAIN_COM_VERSION_MINOR 7
diff --git a/src/Setup/ComSetup.h b/src/Setup/ComSetup.h
index 7a9fad2d..0c1f4d2e 100644
--- a/src/Setup/ComSetup.h
+++ b/src/Setup/ComSetup.h
@@ -1,10 +1,14 @@
-/*
- Copyright (c) 2007 TrueCrypt Developers Association. All rights reserved.
-
- 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.
+
+ 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.
 */
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/Setup/Dir.c b/src/Setup/Dir.c
index ec530df4..2733d5c9 100644
--- a/src/Setup/Dir.c
+++ b/src/Setup/Dir.c
@@ -1,13 +1,15 @@
 /*
  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-2008 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
+ 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' 
+ 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"
 
diff --git a/src/Setup/Dir.h b/src/Setup/Dir.h
index 506dff17..1e4177bb 100644
--- a/src/Setup/Dir.h
+++ b/src/Setup/Dir.h
@@ -1,13 +1,15 @@
 /*
  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-2008 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
+ 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' 
+ 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. */
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/Setup/Linux/veracrypt_install_template.sh b/src/Setup/Linux/veracrypt_install_template.sh
index 5fc0fd8c..04f6cad5 100644
--- a/src/Setup/Linux/veracrypt_install_template.sh
+++ b/src/Setup/Linux/veracrypt_install_template.sh
@@ -1,10 +1,14 @@
 #
-# Copyright (c) 2008-2010 TrueCrypt Developers Association. All rights reserved.
+# 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.
 #
-# 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.
+# 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.
 #
 
 PATH=$PATH:/usr/bin:/bin:/usr/sbin:/sbin:/usr/bin/X11
 
@@ -126,11 +130,11 @@ SOFTWARE IS, BY SUCH ACTION(S), ACCEPTING AND AGREEING TO BE
 BOUND BY ALL TERMS AND CONDITIONS OF THIS LICENSE. IF YOU DO NOT
 ACCEPT THEM, DO NOT USE, COPY, MODIFY, NOR (RE)DISTRIBUTE THE
 SOFTWARE, NOR ANY PART(S) THEREOF.
 
-VeraCrypt is governed by the TrueCrypt License version 3.0,
-a verbatim copy of this version of the TrueCrypt License 
-can be found below.
+VeraCrypt is multi-licensed under Apache License 2.0 and 
+the TrueCrypt License version 3.0, a verbatim copy of both 
+licenses can be found below.
 
 This license does not grant you rights to use any 
 contributors' name, logo, or trademarks, including IDRIX, 
 VeraCrypt and all derivative names.
@@ -139,8 +143,194 @@ VeraCrypt+, VeraCrypt Professional, iVeraCrypt, etc. Nor any
 other names confusingly similar to the name VeraCrypt (e.g., 
 Vera-Crypt, Vera Crypt, VerKrypt, etc.)
 ____________________________________________________________
 
+							Apache License
+					   Version 2.0, January 2004
+					https://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use,
+reproduction, and distribution as defined by Sections 1 through
+9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized
+by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all
+other entities that control, are controlled by, or are under
+common control with that entity. For the purposes of this
+definition, "control" means (i) the power, direct or indirect,
+to cause the direction or management of such entity, whether by
+contract or otherwise, or (ii) ownership of fifty percent (50%)
+or more of the outstanding shares, or (iii) beneficial ownership
+of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity
+exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making
+modifications, including but not limited to software source 
+code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical
+transformation or translation of a Source form, including but
+not limited to compiled object code, generated documentation,
+and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or
+Object form, made available under the License, as indicated by a
+copyright notice that is included in or attached to the work
+(an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or
+Object form, that is based on (or derived from) the Work and for
+which the editorial revisions, annotations, elaborations, or
+other modifications represent, as a whole, an original work of
+authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely
+link (or bind by name) to the interfaces of, the Work and
+Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including
+the original version of the Work and any modifications or
+additions to that Work or Derivative Works thereof, that is
+intentionally submitted to Licensor for inclusion in the Work by
+the copyright owner or by an individual or Legal Entity
+authorized to submit on behalf of the copyright owner. For the
+purposes of this definition, "submitted" means any form 
+of electronic, verbal, or written communication sent to the
+Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control
+systems, and issue tracking systems that are managed by, or on
+behalf of, the Licensor for the purpose of discussing and
+improving the Work, but excluding communication that is
+conspicuously marked or otherwise designated in writing by the
+copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal
+Entity on behalf of whom a Contribution has been received by
+Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and
+conditions of this License, each Contributor hereby grants to
+You a perpetual, worldwide, non-exclusive, no-charge,
+royalty-free, irrevocable copyright license to reproduce,
+prepare Derivative Works of, publicly display, publicly perform,
+sublicense, and distribute the Work and such Derivative Works in
+Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions 
+of this License, each Contributor hereby grants to You a
+perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable(except as stated in this section) patent license 
+to make, have made, use, offer to sell, sell, import, and 
+otherwise transfer the Work, where such license applies only 
+to those patent claims licensable by such Contributor that are
+necessarily infringed by their Contribution(s) alone or by 
+combination of their Contribution(s) with the Work to which such
+Contribution(s) was submitted. If You institute patent
+litigation against any entity (including a cross-claim or 
+counterclaim in a lawsuit) alleging that the Work or a 
+Contribution incorporated within the Work constitutes direct or
+contributory patent infringement, then any patent licenses
+granted to You under this License for that Work shall terminate
+as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of
+the Work or Derivative Works thereof in any medium, with or
+without modifications, and in Source or Object form, provided
+that You meet the following conditions:
+
+(a) You must give any other recipients of the Work or Derivative
+    Works a copy of this License; and
+(b) You must cause any modified files to carry prominent notices
+    stating that You changed the files; and
+(c) You must retain, in the Source form of any Derivative Works
+    that You distribute, all copyright, patent, trademark, and
+    attribution notices from the Source form of the Work,
+    excluding those notices that do not pertain to any part of
+    the Derivative Works; and
+(d) If the Work includes a "NOTICE" text file as part of its
+    distribution, then any Derivative Works that You distribute
+	must include a readable copy of the attribution notices
+	contained within such NOTICE file, excluding those notices
+    that do not pertain to any part of the Derivative Works, in
+	at least one of the following places: within a NOTICE text
+	file distributed as part of the Derivative Works; within the
+	Source form or documentation, if provided along with the
+	Derivative Works; or, within a display generated by the
+	Derivative Works, if and wherever such third-party notices
+	normally appear. The contents of the NOTICE file are for
+	informational purposes only and do not modify the License.
+	You may add Your own attribution notices within Derivative
+	Works that You distribute, alongside or as an addendum to
+	the NOTICE text from the Work, provided that such additional
+    attribution notices cannot be construed as modifying
+	the License.
+
+You may add Your own copyright statement to Your modifications
+and may provide additional or different license terms
+and conditions for use, reproduction, or distribution of 
+Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work
+otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state
+otherwise, any Contribution intentionally submitted for
+inclusion in the Work by You to the Licensor shall be under the
+terms and conditions of this License, without any additional
+terms or conditions. Notwithstanding the above, nothing herein
+shall supersede or modify the terms of any separate license
+agreement you may have executed with Licensor regarding such
+Contributions.
+
+6. Trademarks. This License does not grant permission to use the
+trade names, trademarks, service marks, or product names of the
+Licensor, except as required for reasonable and customary use in
+describing the origin of the Work and reproducing the content of
+the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+agreed to in writing, Licensor provides the Work (and each
+Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied, including, without limitation, any warranties or
+conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, 
+or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible
+for determining the appropriateness of using or redistributing
+the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal
+theory, whether in tort (including negligence), contract,
+or otherwise, unless required by applicable law (such as
+deliberate and grossly negligent acts) or agreed to in writing,
+shall any Contributor be liable to You for damages, including
+any direct, indirect, special, incidental, or consequential
+damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not 
+limited to damages for loss of goodwill, work stoppage, computer
+failure or malfunction, or any and all other commercial damages
+or losses), even if such Contributor has been advised of the
+possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While
+redistributing the Work or Derivative Works thereof, You may
+choose to offer, and charge a fee for, acceptance of support,
+warranty, indemnity, or other liability obligations and/or 
+rights consistent with this License. However, in accepting such
+obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and
+only if You agree to indemnify, defend, and hold each
+Contributor harmless for any liability incurred by, or claims
+asserted against, such Contributor by reason of your accepting
+any such warranty or additional liability.
+____________________________________________________________
+
 TrueCrypt License Version 3.0
 
 Software distributed under this license is distributed on an "AS
 IS" BASIS WITHOUT WARRANTIES OF ANY KIND. THE AUTHORS AND
diff --git a/src/Setup/SelfExtract.c b/src/Setup/SelfExtract.c
index 3ebaf5e6..7cb07b45 100644
--- a/src/Setup/SelfExtract.c
+++ b/src/Setup/SelfExtract.c
@@ -1,10 +1,14 @@
 /*
- Copyright (c) 2008-2009 TrueCrypt Developers Association. All rights reserved.
-
- 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.
+
+ 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"
 
diff --git a/src/Setup/SelfExtract.h b/src/Setup/SelfExtract.h
index f1e62990..b1269c93 100644
--- a/src/Setup/SelfExtract.h
+++ b/src/Setup/SelfExtract.h
@@ -1,10 +1,14 @@
 /*
- Copyright (c) 2008-2009 TrueCrypt Developers Association. All rights reserved.
-
- 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.
+
+ 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 "Setup.h"
 
diff --git a/src/Setup/Setup.c b/src/Setup/Setup.c
index ce52fe3a..3a7751f8 100644
--- a/src/Setup/Setup.c
+++ b/src/Setup/Setup.c
@@ -1,12 +1,14 @@
 /*
  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-2012 TrueCrypt Developers Association
- and are governed by the TrueCrypt License 3.0 the full text of which is
+ 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' 
+ 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"
diff --git a/src/Setup/Setup.h b/src/Setup/Setup.h
index 0b4b68ee..c7ccc293 100644
--- a/src/Setup/Setup.h
+++ b/src/Setup/Setup.h
@@ -1,13 +1,15 @@
 /*
  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
+ 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' 
+ 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 SETUP_H
 #define SETUP_H
@@ -20,8 +22,10 @@ extern "C" {
 static char *szFiles[]=
 {
 	"AVeraCrypt User Guide.pdf",
 	"ALicense.txt",
+	"ALICENSE",
+	"ANOTICE",
 	"AVeraCrypt.exe",
 	"AVeraCryptExpander.exe",
 	"AVeraCrypt Format.exe",
 	"Averacrypt.sys",
@@ -71,8 +75,10 @@ static char *szFiles[]=
 static char *szCompressedFiles[]=
 {
 	"VeraCrypt User Guide.pdf",
 	"License.txt",
+	"LICENSE",
+	"NOTICE",
 	"VeraCrypt.exe",
 	"VeraCryptExpander.exe",
 	"VeraCrypt Format.exe",
 	"VeraCrypt-x64.exe",
diff --git a/src/Setup/Wizard.c b/src/Setup/Wizard.c
index 02b8e8e1..92c75169 100644
--- a/src/Setup/Wizard.c
+++ b/src/Setup/Wizard.c
@@ -1,13 +1,15 @@
 /*
  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-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 TrueCrypt binary and source
+ 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' 
+ 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 <Shlobj.h>
diff --git a/src/Setup/Wizard.h b/src/Setup/Wizard.h
index dc8845ea..22632d43 100644
--- a/src/Setup/Wizard.h
+++ b/src/Setup/Wizard.h
@@ -1,13 +1,15 @@
 /*
  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-2008 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
+ 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' 
+ 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. */
 
 #ifdef __cplusplus
 extern "C" {