VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2019-02-12 18:01:10 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2019-02-12 18:06:22 (GMT)
commit1b76823ea5ea22ae9281dac52d458fde0384a8d2 (patch)
tree5ca7bcb41aad91f01c7fe20743335f2154fe0ad9 /doc
parent86f0fde6e7914f055c5872bf7f2f565cc09977fc (diff)
downloadVeraCrypt-1b76823ea5ea22ae9281dac52d458fde0384a8d2.zip
VeraCrypt-1b76823ea5ea22ae9281dac52d458fde0384a8d2.tar.gz
Add copyright and license information of JitterEntropy library by Stephan Mueller
Diffstat (limited to 'doc')
-rw-r--r--doc/html/Legal Information.html5
-rw-r--r--doc/html/VeraCrypt License.html16
2 files changed, 19 insertions, 2 deletions
diff --git a/doc/html/Legal Information.html b/doc/html/Legal Information.html
index 66b6fc9..07d8745 100644
--- a/doc/html/Legal Information.html
+++ b/doc/html/Legal Information.html
@@ -43,10 +43,10 @@ can be found here</a>.</p>
<h3>Copyright Information</h3>
<p>This software as a whole:<br>
<br>
-Copyright &copy; 2013-2018 IDRIX. All rights reserved.<br>
+Copyright &copy; 2013-2019 IDRIX. All rights reserved.<br>
<br>
Portions of this software:</p>
-<p>Copyright &copy; 2013-2018 IDRIX. All rights reserved.<br>
+<p>Copyright &copy; 2013-2019 IDRIX. All rights reserved.<br>
<br>
Copyright &copy; 2003-2012 TrueCrypt Developers Association. All rights reserved.</p>
<p>Copyright &copy; 1998-2000 Paul Le Roux. All rights reserved.<br>
@@ -57,6 +57,7 @@ Copyright &copy; 1998-2008 Brian Gladman, Worcester, UK. All rights reserved.</p
<p>Copyright &copy; 1999-2017 Dieter Baron and Thomas Klausner.</p>
<p>Copyright &copy; 2013, Alexey Degtyarev. All rights reserved.</p>
<p>Copyright &copy; 1999-2016 Jack Lloyd. All rights reserved.<br>
+<p>Copyright &copy; 2013-2018 Stephan Mueller &lt;smueller@chronox.de&gt;<br>
<br>
For more information, please see the legal notices attached to parts of the source code.</p>
<h3>Trademark Information</h3>
diff --git a/doc/html/VeraCrypt License.html b/doc/html/VeraCrypt License.html
index 6b670e1..b73c91e 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,
<br>
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.<br>
____________________________________________________________<br>
+<br>
+Copyright (c) 2013-2018 Stephan Mueller &lt;smueller@chronox.de&gt;<br>
+<br>
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:<br>
+<ol>
+<li>Redistributions of source code must retain the above copyright notice, and the entire permission notice in its entirety, including the disclaimer of warranties.</li>
+<li>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.</li>
+<li>The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission.</li>
+</ol>
+<p>
+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.)
+</p>
+<p>
+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.
+</p>
+____________________________________________________________<br>
</div>
</body></html> \ No newline at end of file