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/Format/FormatCom.cpp | 14 +++++++++----- src/Format/FormatCom.h | 14 +++++++++----- src/Format/FormatCom.idl | 12 ++++++++---- src/Format/InPlace.c | 14 +++++++++----- src/Format/InPlace.h | 12 ++++++++---- src/Format/Tcformat.c | 16 +++++++++------- src/Format/Tcformat.h | 16 +++++++++------- 7 files changed, 61 insertions(+), 37 deletions(-) (limited to 'src/Format') diff --git a/src/Format/FormatCom.cpp b/src/Format/FormatCom.cpp index ea9c8fed..cc7d2082 100644 --- a/src/Format/FormatCom.cpp +++ b/src/Format/FormatCom.cpp @@ -1,9 +1,13 @@ /* - Copyright (c) 2007-2008 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 diff --git a/src/Format/FormatCom.h b/src/Format/FormatCom.h index 97685e9b..eeab8d8f 100644 --- a/src/Format/FormatCom.h +++ b/src/Format/FormatCom.h @@ -1,9 +1,13 @@ /* - Copyright (c) 2007-2008 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. */ #ifndef TC_HEADER_FORMAT_COM diff --git a/src/Format/FormatCom.idl b/src/Format/FormatCom.idl index be8dc48e..e426bc11 100644 --- a/src/Format/FormatCom.idl +++ b/src/Format/FormatCom.idl @@ -1,9 +1,13 @@ /* - Copyright (c) 2007-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. */ import "wtypes.idl"; diff --git a/src/Format/InPlace.c b/src/Format/InPlace.c index c60a26f8..8d229f48 100644 --- a/src/Format/InPlace.c +++ b/src/Format/InPlace.c @@ -1,9 +1,13 @@ /* - Copyright (c) 2008-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. */ diff --git a/src/Format/InPlace.h b/src/Format/InPlace.h index 50af1805..72e7ca2c 100644 --- a/src/Format/InPlace.h +++ b/src/Format/InPlace.h @@ -1,9 +1,13 @@ /* - 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. */ #ifdef __cplusplus diff --git a/src/Format/Tcformat.c b/src/Format/Tcformat.c index c34de80b..797198ac 100644 --- a/src/Format/Tcformat.c +++ b/src/Format/Tcformat.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-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 + 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/Format/Tcformat.h b/src/Format/Tcformat.h index 628e7223..d6d3ac4b 100644 --- a/src/Format/Tcformat.h +++ b/src/Format/Tcformat.h @@ -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-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. */ #include "Common/Common.h" -- cgit v1.2.3