diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-08-05 23:04:01 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-08-06 00:04:25 +0200 |
| commit | 041024fbb96c4b56a948e26fe75d3115e13edf31 (patch) | |
| tree | dab147a3e4ea8e89e0a5acab8cc6866046fad8d2 /src/Crypto | |
| parent | a23943694b715ecd4f5e7f6eb9c86b7f9a422851 (diff) | |
| download | VeraCrypt-041024fbb96c4b56a948e26fe75d3115e13edf31.tar.gz VeraCrypt-041024fbb96c4b56a948e26fe75d3115e13edf31.zip | |
Update license information to reflect the use of a dual license Apache 2.0 and TrueCrypt 3.0.
Diffstat (limited to 'src/Crypto')
| -rw-r--r-- | src/Crypto/Aes_hw_cpu.h | 16 | ||||
| -rw-r--r-- | src/Crypto/Rmd160.c | 15 | ||||
| -rw-r--r-- | src/Crypto/Serpent.c | 1 | ||||
| -rw-r--r-- | src/Crypto/Twofish.c | 1 |
4 files changed, 22 insertions, 11 deletions
diff --git a/src/Crypto/Aes_hw_cpu.h b/src/Crypto/Aes_hw_cpu.h index a5324a2b..54d44932 100644 --- a/src/Crypto/Aes_hw_cpu.h +++ b/src/Crypto/Aes_hw_cpu.h @@ -1,9 +1,13 @@ -/*
- Copyright (c) 2010 TrueCrypt Developers Association. All rights reserved.
-
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+/* + Derived from source code of TrueCrypt 7.1a, which is + Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed + by the TrueCrypt License 3.0. + + Modifications and additions to the original source code (contained in this file) + and all other portions of this file are Copyright (c) 2013-2015 IDRIX + and are governed by the Apache License 2.0 the full text of which is + contained in the file License.txt included in VeraCrypt binary and source + code distribution packages. */
#ifndef TC_HEADER_Crypto_Aes_Hw_Cpu
diff --git a/src/Crypto/Rmd160.c b/src/Crypto/Rmd160.c index 05285c0a..d42b61c5 100644 --- a/src/Crypto/Rmd160.c +++ b/src/Crypto/Rmd160.c @@ -8,6 +8,7 @@ */
/* Adapted for TrueCrypt */
+/* Adapted for VeraCrypt */
#include <memory.h>
#include "Common/Tcdefs.h"
@@ -378,11 +379,15 @@ void RMD160Transform (unsigned __int32 *digest, const unsigned __int32 *data) #else // TC_MINIMIZE_CODE_SIZE
/*
- Copyright (c) 2008 TrueCrypt Developers Association. All rights reserved.
-
- Governed by the TrueCrypt License 3.0 the full text of which is contained in
- the file License.txt included in TrueCrypt binary and source code distribution
- packages.
+ Derived from source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
+ by the TrueCrypt License 3.0.
+
+ Modifications and additions to the original source code (contained in this file)
+ and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and are governed by the Apache License 2.0 the full text of which is
+ contained in the file License.txt included in VeraCrypt binary and source
+ code distribution packages.
*/
#pragma optimize ("tl", on)
diff --git a/src/Crypto/Serpent.c b/src/Crypto/Serpent.c index 0d4ab6c5..87d710c4 100644 --- a/src/Crypto/Serpent.c +++ b/src/Crypto/Serpent.c @@ -1,6 +1,7 @@ // serpent.cpp - written and placed in the public domain by Wei Dai
/* Adapted for TrueCrypt */
+/* Adapted for VeraCrypt */
#ifdef TC_WINDOWS_BOOT
#pragma optimize ("t", on)
diff --git a/src/Crypto/Twofish.c b/src/Crypto/Twofish.c index de5b1b66..2273ac5e 100644 --- a/src/Crypto/Twofish.c +++ b/src/Crypto/Twofish.c @@ -30,6 +30,7 @@ */
/* Adapted for TrueCrypt */
+/* Adapted for VeraCrypt */
#ifdef TC_WINDOWS_BOOT
|