From 041024fbb96c4b56a948e26fe75d3115e13edf31 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Wed, 5 Aug 2015 23:04:01 +0200 Subject: Update license information to reflect the use of a dual license Apache 2.0 and TrueCrypt 3.0. --- src/ExpandVolume/InitDataArea.h | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) (limited to 'src/ExpandVolume/InitDataArea.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,26 +1,16 @@ -/* - -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 - -------------------------------------------------------------------------------- - -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 + + + 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 -- cgit v1.2.3