From 1b76823ea5ea22ae9281dac52d458fde0384a8d2 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI
Date: Tue, 12 Feb 2019 19:01:10 +0100
Subject: Add copyright and license information of JitterEntropy library by
Stephan Mueller
---
License.txt | 37 +++++++++++++++++++++++++++++++++++++
README.md | 9 +++++----
doc/html/Legal Information.html | 5 +++--
doc/html/VeraCrypt License.html | 16 ++++++++++++++++
src/Common/Dlgcode.c | 5 +++--
src/Main/Forms/AboutDialog.cpp | 5 +++--
src/Readme.txt | 5 +++--
src/Resources/Texts/License.rtf | 39 ++++++++++++++++++++++++++++++++-------
8 files changed, 102 insertions(+), 19 deletions(-)
diff --git a/License.txt b/License.txt
index 2bee6bff..693ee2df 100644
--- a/License.txt
+++ b/License.txt
@@ -770,3 +770,40 @@ 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-2018 Stephan Mueller
+
+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, and the entire permission notice in its entirety,
+ including the disclaimer of warranties.
+
+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 name of the author may not be used to endorse or promote
+ products derived from this software without specific prior
+ written permission.
+
+ALTERNATIVELY, this product may be distributed under the terms of
+the GNU General Public License, in which case the provisions of the
+GPL2 are required INSTEAD OF the above restrictions. (This clause is
+necessary due to a potential bad interaction between the GPL and the
+restrictions contained in a BSD-style copyright.)
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF WHICH
+ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR 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 NOT ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+____________________________________________________________
diff --git a/README.md b/README.md
index 88adc0d2..877d103c 100644
--- a/README.md
+++ b/README.md
@@ -241,18 +241,19 @@ Copyright Information
---------------------
This software as a whole:
-Copyright (c) 2013-2018 IDRIX. All rights reserved.
+Copyright (c) 2013-2019 IDRIX. All rights reserved.
Portions of this software:
-Copyright (c) 2013-2018 IDRIX. All rights reserved.
+Copyright (c) 2013-2019 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) 1999-2017 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-2016 Jack Lloyd. All rights reserved.
+Copyright (c) 1999-2016 Jack Lloyd. All rights reserved.
+Copyright (c) 2013-2018 Stephan Mueller
For more information, please see the legal notices attached to parts of the
source code.
diff --git a/doc/html/Legal Information.html b/doc/html/Legal Information.html
index 66b6fc92..07d8745e 100644
--- a/doc/html/Legal Information.html
+++ b/doc/html/Legal Information.html
@@ -43,10 +43,10 @@ can be found here.
Copyright Information
This software as a whole:
-Copyright © 2013-2018 IDRIX. All rights reserved.
+Copyright © 2013-2019 IDRIX. All rights reserved.
Portions of this software:
-Copyright © 2013-2018 IDRIX. All rights reserved.
+
Copyright © 2013-2019 IDRIX. All rights reserved.
Copyright © 2003-2012 TrueCrypt Developers Association. All rights reserved.
Copyright © 1998-2000 Paul Le Roux. All rights reserved.
@@ -57,6 +57,7 @@ Copyright © 1998-2008 Brian Gladman, Worcester, UK. All rights reserved.
Copyright © 1999-2017 Dieter Baron and Thomas Klausner.
Copyright © 2013, Alexey Degtyarev. All rights reserved.
Copyright © 1999-2016 Jack Lloyd. All rights reserved.
+
Copyright © 2013-2018 Stephan Mueller <smueller@chronox.de>
For more information, please see the legal notices attached to parts of the source code.
Trademark Information
diff --git a/doc/html/VeraCrypt License.html b/doc/html/VeraCrypt License.html
index 6b670e1c..b73c91ea 100644
--- a/doc/html/VeraCrypt License.html
+++ b/doc/html/VeraCrypt License.html
@@ -404,5 +404,21 @@ Redistribution and use in source and binary forms, with or without modification,
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-2018 Stephan Mueller <smueller@chronox.de>
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice, and the entire permission notice in its entirety, including the disclaimer of warranties.
+- 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.
+- The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission.
+
+
+ALTERNATIVELY, this product may be distributed under the terms of the GNU General Public License, in which case the provisions of the GPL2 are required INSTEAD OF the above restrictions. (This clause is necessary due to a potential bad interaction between the GPL and the restrictions contained in a BSD-style copyright.)
+
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR 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 NOT ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+____________________________________________________________