--- truecrypt/crypto/sha2.h 2018/04/24 16:48:51 1.1.1.1 +++ truecrypt/crypto/sha2.h 2018/04/24 16:51:44 1.1.1.2 @@ -4,22 +4,17 @@ LICENSE TERMS - The free distribution and use of this software in both source and binary - form is allowed (with or without changes) provided that: + The free distribution and use of this software is allowed (with or without + changes) provided that: - 1. distributions of this source code include the above copyright - notice, this list of conditions and the following disclaimer; + 1. source code distributions include the above copyright notice, this + list of conditions and the following disclaimer; - 2. distributions in binary form include the above copyright - notice, this list of conditions and the following disclaimer - in the documentation and/or other associated materials; - - 3. the copyright holder's name is not used to endorse products - built using this software without specific written permission. - - ALTERNATIVELY, provided that this notice is retained in full, this product - may be distributed under the terms of the GNU General Public License (GPL), - in which case the provisions of the GPL apply INSTEAD OF those given above. + 2. binary distributions include the above copyright notice, this list + of conditions and the following disclaimer in their documentation; + + 3. the name of the copyright holder is not used to endorse products + built using this software without specific written permission. DISCLAIMER