From 18273e5f3bf13c2aba63b13743fa1ed78c1077f7 Mon Sep 17 00:00:00 2001 From: Philip Zimmermann Date: Sun, 10 Feb 2013 22:07:19 +0000 Subject: [PATCH] Relicense ECC code under APGLv3 with exception for FreeSWITCH Thanks to Travis Cross for pushing for this to happen. Signed-off-by: Philip Zimmermann Signed-off-by: Travis Cross --- libs/libzrtp/include/zrtp_ec.h | 12 ++++-------- libs/libzrtp/src/zrtp_crypto_ec.c | 12 ++++-------- libs/libzrtp/src/zrtp_crypto_ecdh.c | 12 ++++-------- libs/libzrtp/src/zrtp_crypto_ecdsa.c | 12 ++++-------- libs/libzrtp/src/zrtp_legal.c | 8 -------- 5 files changed, 16 insertions(+), 40 deletions(-) diff --git a/libs/libzrtp/include/zrtp_ec.h b/libs/libzrtp/include/zrtp_ec.h index c4d2f712c6..42e68c553f 100644 --- a/libs/libzrtp/include/zrtp_ec.h +++ b/libs/libzrtp/include/zrtp_ec.h @@ -1,12 +1,8 @@ /* - * zrtp_crypto_ec.c - Elliptic Curve Low Level Crypto functions for ZRTP. - * NSA Suite B Elliptic Curves from NIST SP 800-56A and FIPS 186-3. - * - * Copyright (c) 2006-2009 Philip R. Zimmermann. All rights reserved. - * This is NOT licensed under the GPL or any other open source license. - * For licensing terms or other information, - * contact: Philip Zimmermann . - * For more contact information, see http://philzimmermann.com + * libZRTP SDK library, implements the ZRTP secure VoIP protocol. + * Copyright (c) 2006-2009 Philip R. Zimmermann. All rights reserved. + * Contact: http://philzimmermann.com + * For licensing and other legal details, see the file zrtp_legal.c. */ #ifndef __ZRTP_CRYPTO_EC_H__ diff --git a/libs/libzrtp/src/zrtp_crypto_ec.c b/libs/libzrtp/src/zrtp_crypto_ec.c index 818081c74d..a593bc07e5 100644 --- a/libs/libzrtp/src/zrtp_crypto_ec.c +++ b/libs/libzrtp/src/zrtp_crypto_ec.c @@ -1,12 +1,8 @@ /* - * zrtp_crypto_ec.c - Elliptic Curve Low Level Crypto functions for ZRTP. - * NSA Suite B Elliptic Curves from NIST SP 800-56A and FIPS 186-3. - * - * Copyright (c) 2006-2009 Philip R. Zimmermann. All rights reserved. - * This is NOT licensed under the GPL or any other open source license. - * For licensing terms or other information, - * contact: Philip Zimmermann . - * For more contact information, see http://philzimmermann.com + * libZRTP SDK library, implements the ZRTP secure VoIP protocol. + * Copyright (c) 2006-2009 Philip R. Zimmermann. All rights reserved. + * Contact: http://philzimmermann.com + * For licensing and other legal details, see the file zrtp_legal.c. */ #include "zrtp.h" diff --git a/libs/libzrtp/src/zrtp_crypto_ecdh.c b/libs/libzrtp/src/zrtp_crypto_ecdh.c index b78ecb1439..96840fee29 100644 --- a/libs/libzrtp/src/zrtp_crypto_ecdh.c +++ b/libs/libzrtp/src/zrtp_crypto_ecdh.c @@ -1,12 +1,8 @@ /* - * zrtp_crypto_ecdh.c - Elliptic Curve Diffie Hellman functions for ZRTP. - * NSA Suite B Elliptic Curves from NIST SP 800-56A and FIPS 186-3. - * - * Copyright (c) 2006-2009 Philip R. Zimmermann. All rights reserved. - * This is NOT licensed under the GPL or any other open source license. - * For licensing terms or other information, - * contact: Philip Zimmermann . - * For more contact information, see http://philzimmermann.com + * libZRTP SDK library, implements the ZRTP secure VoIP protocol. + * Copyright (c) 2006-2009 Philip R. Zimmermann. All rights reserved. + * Contact: http://philzimmermann.com + * For licensing and other legal details, see the file zrtp_legal.c. */ #include "zrtp.h" diff --git a/libs/libzrtp/src/zrtp_crypto_ecdsa.c b/libs/libzrtp/src/zrtp_crypto_ecdsa.c index 679f1259c1..fc86f12d2a 100644 --- a/libs/libzrtp/src/zrtp_crypto_ecdsa.c +++ b/libs/libzrtp/src/zrtp_crypto_ecdsa.c @@ -1,12 +1,8 @@ /* - * zrtp_crypto_ecdsa.c - Elliptic Curve Digital Signature functions for ZRTP. - * NSA Suite B Elliptic Curves from NIST SP 800-56A and FIPS 186-3. - * - * Copyright (c) 2006-2009 Philip R. Zimmermann. All rights reserved. - * This is NOT licensed under the GPL or any other open source license. - * For licensing terms or other information, - * contact: Philip Zimmermann . - * For more contact information, see http://philzimmermann.com + * libZRTP SDK library, implements the ZRTP secure VoIP protocol. + * Copyright (c) 2006-2009 Philip R. Zimmermann. All rights reserved. + * Contact: http://philzimmermann.com + * For licensing and other legal details, see the file zrtp_legal.c. */ #include "zrtp.h" diff --git a/libs/libzrtp/src/zrtp_legal.c b/libs/libzrtp/src/zrtp_legal.c index 33b5c2dfc4..0261977d0d 100644 --- a/libs/libzrtp/src/zrtp_legal.c +++ b/libs/libzrtp/src/zrtp_legal.c @@ -46,14 +46,6 @@ * derivative work of the FreeSWITCH code in the same work, the terms * of the AGPLv3 apply. * - * You might have received some files with this library that are not - * covered by this license grant. These files have a header - * identifying the copyright holder as Philip R. Zimmermann and a - * clear statement that the file is not freely available, such as, - * "This is NOT licensed under the GPL or any other open source - * license." This document grants you no right to distribute or use - * these files. - * * I, Phil Zimmermann, would like to make the following non-binding * request of any contributors to this library: please make your * changes available for me to sublicense. I support myself in part