Relicense ECC code under APGLv3 with exception for FreeSWITCH

Thanks to Travis Cross for pushing for this to happen.

Signed-off-by: Philip Zimmermann <prz@mit.edu>
Signed-off-by: Travis Cross <tc@traviscross.com>

diff --git a/libs/libzrtp/include/zrtp_ec.h b/libs/libzrtp/include/zrtp_ec.h
index c4d2f712c6d5b3e845155e6c0e70278c9a696099..42e68c553fb00715d4603881746bf1be78667fe3 100644 (file)
--- 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 <prz@mit.edu>.
- * 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 818081c74d107a762a261c19820044e81c1931a5..a593bc07e5e8a1439b4e44a6b5667042c246477e 100644 (file)
--- 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 <prz@mit.edu>.
- * 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 b78ecb14394e013580b8c91243517db91880a5ac..96840fee29a9e26c31731ecfd7ee177a352d9b18 100644 (file)
--- 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 <prz@mit.edu>.
- * 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 679f1259c126f553286265a652d9b2a9cda31e08..fc86f12d2a97445458749aa2b8afd444755f9ba4 100644 (file)
--- 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 <prz@mit.edu>.
- * 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 33b5c2dfc426428b7b4b65326f3732f539fdb874..0261977d0d1da44c6f2cf3613d0f69edcac5b686 100644 (file)
--- 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