VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Resources
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2016-10-04 13:21:48 +0200
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2016-10-17 18:40:23 +0200
commite5a9e9239b0cf1001d9b91497b4ff3ab4a190b1f (patch)
tree5656a151e5f777d834924a3784432c5bd928ed03 /src/Resources
parent7ff3c5d1080482c55a5c5f4720d22d212a8d7373 (diff)
downloadVeraCrypt-e5a9e9239b0cf1001d9b91497b4ff3ab4a190b1f.tar.gz
VeraCrypt-e5a9e9239b0cf1001d9b91497b4ff3ab4a190b1f.zip
Crypto: Use SIMD optimized Serpent implementation from Botan. 2.5x speed gain factor. Update credits and copyrights notice.
Diffstat (limited to 'src/Resources')
-rw-r--r--src/Resources/Texts/License.rtf6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/Resources/Texts/License.rtf b/src/Resources/Texts/License.rtf
index cccbb15d..1af5c90f 100644
--- a/src/Resources/Texts/License.rtf
+++ b/src/Resources/Texts/License.rtf
@@ -57,5 +57,11 @@ Copyright (c) 2013, Alexey Degtyarev. All rights reserved.\par
____________________________________________________________\par
Copyright (c) 2016. Disk Cryptography Services for EFI (DCS), Alex Kolotnikov\par
This program and the accompanying materials are licensed and made available under the terms and conditions of the GNU Lesser General Public License, version 3.0 (LGPL-3.0).\line\line The full text of the license may be found at {\field{\*\fldinst{HYPERLINK "https://opensource.org/licenses/LGPL-3.0"}}{\fldrslt{\ul\cf1 https://opensource.org/licenses/LGPL-3.0}}}\f0\fs16\par
+____________________________________________________________\f2\par
+Copyright (c) 1999-2013,2014,2015,2016 Jack Lloyd. All rights reserved.\par
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\par
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\par
+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.\par
+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.\f0\par
}