VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/License.txt
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 /License.txt
parent86f0fde6e7914f055c5872bf7f2f565cc09977fc (diff)
downloadVeraCrypt-1b76823ea5ea22ae9281dac52d458fde0384a8d2.zip
VeraCrypt-1b76823ea5ea22ae9281dac52d458fde0384a8d2.tar.gz
Add copyright and license information of JitterEntropy library by Stephan Mueller
Diffstat (limited to 'License.txt')
-rw-r--r--License.txt37
1 files changed, 37 insertions, 0 deletions
diff --git a/License.txt b/License.txt
index 2bee6bf..693ee2d 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 <smueller@chronox.de>
+
+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.
+____________________________________________________________