VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/License.txt
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/License.txt
parent5dfdc1b4a5000173d01ce4809344c087807350d3 (diff)
downloadVeraCrypt-3e029b0dde5326a4f1221c86a2050aafceaafa3e.tar.gz
VeraCrypt-3e029b0dde5326a4f1221c86a2050aafceaafa3e.zip
Update copyrights in legal notices and license file.
Diffstat (limited to 'src/License.txt')
-rw-r--r--src/License.txt120
1 files changed, 51 insertions, 69 deletions
diff --git a/src/License.txt b/src/License.txt
index 819e1658..675207ec 100644
--- a/src/License.txt
+++ b/src/License.txt
@@ -679,76 +679,58 @@ 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) 1990-2002 Info-ZIP. All rights reserved.
-
-For the purposes of this copyright and license, "Info-ZIP" is defined as
-the following set of individuals:
-
-Mark Adler, John Bush, Karl Davis, Harald Denker, Jean-Michel Dubois,
-Jean-loup Gailly, Hunter Goatley, Ian Gorman, Chris Herborth, Dirk Haase,
-Greg Hartwig, Robert Heath, Jonathan Hudson, Paul Kienitz,
-David Kirschbaum, Johnny Lee, Onno van der Linden, Igor Mandrichenko,
-Steve P. Miller, Sergio Monesi, Keith Owens, George Petrov, Greg Roelofs,
-Kai Uwe Rommel, Steve Salisbury, Dave Smith, Christian Spieler,
-Antoine Verheijen, Paul von Behren, Rich Wales, Mike White
-
-This software is provided "as is", without warranty of any kind, express
-or implied. In no event shall Info-ZIP or its contributors be held liable
-for any direct, indirect, incidental, special or consequential damages
-arising out of the use of or inability to use 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. Redistributions of source code must retain the above copyright notice,
- definition, disclaimer, and this list of conditions.
-
- 2. Redistributions in binary form (compiled executables) must reproduce
- the above copyright notice, definition, disclaimer, and this list of
- conditions in documentation and/or other materials provided with the
- distribution. The sole exception to this condition is redistribution
- of a standard UnZipSFX binary as part of a self-extracting archive;
- that is permitted without inclusion of this license, as long as the
- normal UnZipSFX banner has not been removed from the binary or disabled.
-
- 3. Altered versions--including, but not limited to, ports to new
- operating systems, existing ports with new graphical interfaces, and
- dynamic, shared, or static library versions--must be plainly marked
- as such and must not be misrepresented as being the original source.
- Such altered versions also must not be misrepresented as being
- Info-ZIP releases--including, but not limited to, labeling of the
- altered versions with the names "Info-ZIP" (or any variation thereof,
- including, but not limited to, different capitalizations),
- "Pocket UnZip", "WiZ" or "MacZip" without the explicit permission of
- Info-ZIP. Such altered versions are further prohibited from
- misrepresentative use of the Zip-Bugs or Info-ZIP e-mail addresses or
- of the Info-ZIP URL(s).
-
- 4. Info-ZIP retains the right to use the names "Info-ZIP", "Zip", "UnZip",
- "UnZipSFX", "WiZ", "Pocket UnZip", "Pocket Zip", and "MacZip" for its
- own source and binary releases.
+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.