VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Release
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2016-09-26 14:45:10 +0200
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2016-10-17 18:40:19 +0200
commit3e029b0dde5326a4f1221c86a2050aafceaafa3e (patch)
tree1ba59cd6aa67167188accebb4fac4cdef427ecef /src/Release
parent5dfdc1b4a5000173d01ce4809344c087807350d3 (diff)
downloadVeraCrypt-3e029b0dde5326a4f1221c86a2050aafceaafa3e.tar.gz
VeraCrypt-3e029b0dde5326a4f1221c86a2050aafceaafa3e.zip
Update copyrights in legal notices and license file.
Diffstat (limited to 'src/Release')
-rw-r--r--src/Release/Setup Files/License.txt82
-rw-r--r--src/Release/Setup Files/NOTICE83
2 files changed, 125 insertions, 40 deletions
diff --git a/src/Release/Setup Files/License.txt b/src/Release/Setup Files/License.txt
index dc686dd1..675207ec 100644
--- a/src/Release/Setup Files/License.txt
+++ b/src/Release/Setup Files/License.txt
@@ -679,24 +679,66 @@ warranties in respect of its properties, including, but not
limited to, correctness and/or fitness for purpose.
____________________________________________________________
-Copyright (C) 2002-2004 Mark Adler, all rights reserved
-version 1.8, 9 Jan 2004
-
-This software is provided 'as-is', without any express or
-implied warranty. In no event will the author be held liable
-for any damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any
-purpose, including commercial applications, and to alter it and
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you
- must not claim that you wrote the original software. If you
- use this software in a product, an acknowledgment in the
- product documentation would be appreciated but is not
- required.
-2. Altered source versions must be plainly marked as such, and
- must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source
- distribution.
+Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Jean-loup Gailly Mark Adler
+ jloup@gzip.org madler@alumni.caltech.edu
+____________________________________________________________
+Copyright (C) 1999-2016 Dieter Baron and Thomas Klausner
+
+The authors can be contacted at <libzip@nih.at>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+3. The names of the authors may not be used to endorse or promote
+ products derived from this software without specific prior
+ written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+____________________________________________________________
+Copyright (c) 2013, Alexey Degtyarev. All rights reserved.
+
+____________________________________________________________
+Copyright (c) 2016. Disk Cryptography Services for EFI (DCS), Alex Kolotnikov
+This program and the accompanying materials are licensed and made available
+under the terms and conditions of the GNU Lesser General Public License,
+version 3.0 (LGPL-3.0).
+
+The full text of the license may be found at https://opensource.org/licenses/LGPL-3.0
____________________________________________________________
diff --git a/src/Release/Setup Files/NOTICE b/src/Release/Setup Files/NOTICE
index 6c2416c2..a87a4d33 100644
--- a/src/Release/Setup Files/NOTICE
+++ b/src/Release/Setup Files/NOTICE
@@ -111,24 +111,67 @@ warranties in respect of its properties, including, but not
limited to, correctness and/or fitness for purpose.
____________________________________________________________
-Copyright (C) 2002-2004 Mark Adler, all rights reserved
-version 1.8, 9 Jan 2004
-
-This software is provided 'as-is', without any express or
-implied warranty. In no event will the author be held liable
-for any damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any
-purpose, including commercial applications, and to alter it and
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you
- must not claim that you wrote the original software. If you
- use this software in a product, an acknowledgment in the
- product documentation would be appreciated but is not
- required.
-2. Altered source versions must be plainly marked as such, and
- must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source
- distribution.
+Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Jean-loup Gailly Mark Adler
+ jloup@gzip.org madler@alumni.caltech.edu
____________________________________________________________
+Copyright (C) 1999-2016 Dieter Baron and Thomas Klausner
+
+The authors can be contacted at <libzip@nih.at>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+3. The names of the authors may not be used to endorse or promote
+ products derived from this software without specific prior
+ written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+____________________________________________________________
+Copyright (c) 2013, Alexey Degtyarev. All rights reserved.
+
+____________________________________________________________
+Copyright (c) 2016. Disk Cryptography Services for EFI (DCS), Alex Kolotnikov
+This program and the accompanying materials are licensed and made available
+under the terms and conditions of the GNU Lesser General Public License,
+version 3.0 (LGPL-3.0).
+
+The full text of the license may be found at https://opensource.org/licenses/LGPL-3.0
+____________________________________________________________
+