VeraCrypt
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--License.txt30
-rw-r--r--README.md8
-rw-r--r--src/Common/Dlgcode.c8
-rw-r--r--src/License.html4
-rw-r--r--src/License.txt4
-rw-r--r--src/Main/Forms/AboutDialog.cpp8
-rw-r--r--src/Readme.txt8
7 files changed, 49 insertions, 21 deletions
diff --git a/License.txt b/License.txt
index eff73291..2bee6bff 100644
--- a/License.txt
+++ b/License.txt
@@ -700,7 +700,7 @@ Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
Jean-loup Gailly Mark Adler
jloup@gzip.org madler@alumni.caltech.edu
____________________________________________________________
-Copyright (C) 1999-2016 Dieter Baron and Thomas Klausner
+Copyright (C) 1999-2017 Dieter Baron and Thomas Klausner
The authors can be contacted at <libzip@nih.at>
@@ -742,3 +742,31 @@ version 3.0 (LGPL-3.0).
The full text of the license may be found at https://opensource.org/licenses/LGPL-3.0
____________________________________________________________
+Copyright (c) 1999-2016 Jack Lloyd.
+
+All rights reserved.
+
+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.
+
+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.
+____________________________________________________________
diff --git a/README.md b/README.md
index 65f5d1e7..988a622e 100644
--- a/README.md
+++ b/README.md
@@ -241,18 +241,18 @@ Copyright Information
---------------------
This software as a whole:
-Copyright (c) 2013-2017 IDRIX. All rights reserved.
+Copyright (c) 2013-2018 IDRIX. All rights reserved.
Portions of this software:
-Copyright (c) 2013-2017 IDRIX. All rights reserved.
+Copyright (c) 2013-2018 IDRIX. All rights reserved.
Copyright (c) 2003-2012 TrueCrypt Developers Association. All rights reserved.
Copyright (c) 1998-2000 Paul Le Roux. All rights reserved.
Copyright (c) 1998-2008 Brian Gladman, Worcester, UK. All rights reserved.
Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler.
Copyright (c) 2016 Disk Cryptography Services for EFI (DCS), Alex Kolotnikov
-Copyright (c) Dieter Baron and Thomas Klausner.
+Copyright (C) 1999-2017 Dieter Baron and Thomas Klausner.
Copyright (c) 2013, Alexey Degtyarev. All rights reserved.
-Copyright (c) 1999-2013,2014,2015,2016 Jack Lloyd. All rights reserved.
+Copyright (c) 1999-2016 Jack Lloyd. All rights reserved.
For more information, please see the legal notices attached to parts of the
source code.
diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c
index 6a79bcd2..eed087aa 100644
--- a/src/Common/Dlgcode.c
+++ b/src/Common/Dlgcode.c
@@ -1267,18 +1267,18 @@ BOOL CALLBACK AboutDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
L"Based on TrueCrypt 7.1a, freely available at http://www.truecrypt.org/ .\r\n\r\n"
L"Portions of this software:\r\n"
- L"Copyright \xA9 2013-2017 IDRIX. All rights reserved.\r\n"
+ L"Copyright \xA9 2013-2018 IDRIX. All rights reserved.\r\n"
L"Copyright \xA9 2003-2012 TrueCrypt Developers Association. All Rights Reserved.\r\n"
L"Copyright \xA9 1998-2000 Paul Le Roux. All Rights Reserved.\r\n"
L"Copyright \xA9 1998-2008 Brian Gladman. All Rights Reserved.\r\n"
L"Copyright \xA9 1995-2017 Jean-loup Gailly and Mark Adler.\r\n"
L"Copyright \xA9 2016 Disk Cryptography Services for EFI (DCS), Alex Kolotnikov.\r\n"
- L"Copyright \xA9 Dieter Baron and Thomas Klausner.\r\n"
+ L"Copyright \xA9 1999-2017 Dieter Baron and Thomas Klausner.\r\n"
L"Copyright \xA9 2013, Alexey Degtyarev. All rights reserved.\r\n"
- L"Copyright \xA9 1999-2013,2014,2015,2016 Jack Lloyd. All rights reserved.\r\n\r\n"
+ L"Copyright \xA9 1999-2016 Jack Lloyd. All rights reserved.\r\n\r\n"
L"This software as a whole:\r\n"
- L"Copyright \xA9 2013-2017 IDRIX. All rights reserved.\r\n\r\n"
+ L"Copyright \xA9 2013-2018 IDRIX. All rights reserved.\r\n\r\n"
L"An IDRIX Release");
diff --git a/src/License.html b/src/License.html
index 7cb7e612..ce476eeb 100644
--- a/src/License.html
+++ b/src/License.html
@@ -177,7 +177,7 @@ Permission is granted to anyone to use this software for any purpose, including
jloup@gzip.org madler@alumni.caltech.edu<br>
____________________________________________________________<br>
<br>
- Copyright (C) 1999-2016 Dieter Baron and Thomas Klausner<br>
+ Copyright (C) 1999-2017 Dieter Baron and Thomas Klausner<br>
<br>
The authors can be contacted at <libzip@nih.at><br>
<br>
@@ -203,7 +203,7 @@ ________________________________________________________<br>
The full text of the license may be found at https://opensource.org/licenses/LGPL-3.0<br>
____________________________________________________________<br>
<br>
- Copyright (c) 1999-2013,2014,2015,2016 Jack Lloyd. <br>
+ Copyright (c) 1999-2016 Jack Lloyd. <br>
<br>
All rights reserved.<br>
<br>
diff --git a/src/License.txt b/src/License.txt
index b55918da..2bee6bff 100644
--- a/src/License.txt
+++ b/src/License.txt
@@ -700,7 +700,7 @@ Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
Jean-loup Gailly Mark Adler
jloup@gzip.org madler@alumni.caltech.edu
____________________________________________________________
-Copyright (C) 1999-2016 Dieter Baron and Thomas Klausner
+Copyright (C) 1999-2017 Dieter Baron and Thomas Klausner
The authors can be contacted at <libzip@nih.at>
@@ -742,7 +742,7 @@ version 3.0 (LGPL-3.0).
The full text of the license may be found at https://opensource.org/licenses/LGPL-3.0
____________________________________________________________
-Copyright (c) 1999-2013,2014,2015,2016 Jack Lloyd.
+Copyright (c) 1999-2016 Jack Lloyd.
All rights reserved.
diff --git a/src/Main/Forms/AboutDialog.cpp b/src/Main/Forms/AboutDialog.cpp
index b2c44ed0..76e7bc16 100644
--- a/src/Main/Forms/AboutDialog.cpp
+++ b/src/Main/Forms/AboutDialog.cpp
@@ -57,18 +57,18 @@ namespace VeraCrypt
L"Paulo Barreto, Brian Gladman, Wei Dai, Peter Gutmann, and many others.\n\n"
L"Portions of this software:\n"
- L"Copyright \xA9 2013-2017 IDRIX. All rights reserved.\n"
+ L"Copyright \xA9 2013-2018 IDRIX. All rights reserved.\n"
L"Copyright \xA9 2003-2012 TrueCrypt Developers Association. All Rights Reserved.\n"
L"Copyright \xA9 1998-2000 Paul Le Roux. All Rights Reserved.\n"
L"Copyright \xA9 1998-2008 Brian Gladman. All Rights Reserved.\n"
L"Copyright \xA9 1995-2017 Jean-loup Gailly and Mark Adler.\n"
L"Copyright \xA9 2016 Disk Cryptography Services for EFI (DCS), Alex Kolotnikov.\n"
- L"Copyright \xA9 Dieter Baron and Thomas Klausner.\n"
+ L"Copyright \xA9 1999-2017 Dieter Baron and Thomas Klausner.\n"
L"Copyright \xA9 2013, Alexey Degtyarev. All rights reserved.\n"
- L"Copyright \xA9 1999-2013,2014,2015,2016 Jack Lloyd. All rights reserved.\n\n"
+ L"Copyright \xA9 1999-2016 Jack Lloyd. All rights reserved.\n\n"
L"\nThis software as a whole:\n"
- L"Copyright \xA9 2013-2017 IDRIX. All rights reserved.\n\n"
+ L"Copyright \xA9 2013-2018 IDRIX. All rights reserved.\n\n"
L"This software uses wxWidgets library, which is copyright \xA9 1998-2011 Julian Smart, Robert Roebling et al.\n\n"
diff --git a/src/Readme.txt b/src/Readme.txt
index 65f5d1e7..b756efc9 100644
--- a/src/Readme.txt
+++ b/src/Readme.txt
@@ -241,18 +241,18 @@ Copyright Information
---------------------
This software as a whole:
-Copyright (c) 2013-2017 IDRIX. All rights reserved.
+Copyright (c) 2013-2018 IDRIX. All rights reserved.
Portions of this software:
-Copyright (c) 2013-2017 IDRIX. All rights reserved.
+Copyright (c) 2013-2018 IDRIX. All rights reserved.
Copyright (c) 2003-2012 TrueCrypt Developers Association. All rights reserved.
Copyright (c) 1998-2000 Paul Le Roux. All rights reserved.
Copyright (c) 1998-2008 Brian Gladman, Worcester, UK. All rights reserved.
Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler.
Copyright (c) 2016 Disk Cryptography Services for EFI (DCS), Alex Kolotnikov
-Copyright (c) Dieter Baron and Thomas Klausner.
+Copyright (c) 1999-2017 Dieter Baron and Thomas Klausner.
Copyright (c) 2013, Alexey Degtyarev. All rights reserved.
-Copyright (c) 1999-2013,2014,2015,2016 Jack Lloyd. All rights reserved.
+Copyright (c) 1999-2016 Jack Lloyd. All rights reserved.
For more information, please see the legal notices attached to parts of the
source code.