From 7f70dbcad58eb7183d129860192d6968dd7063a1 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 12 Feb 2007 22:32:37 +0000 Subject: Rob Crittenden added support for NSS (Network Security Service) for the SSL/TLS layer. http://www.mozilla.org/projects/security/pki/nss/ --- docs/LICENSE-MIXING | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'docs/LICENSE-MIXING') diff --git a/docs/LICENSE-MIXING b/docs/LICENSE-MIXING index 60f5f934c..c5a158446 100644 --- a/docs/LICENSE-MIXING +++ b/docs/LICENSE-MIXING @@ -47,6 +47,14 @@ yassl http://www.yassl.com/ (May be used for SSL/TLS support) Uses the GPL[1] license. If this is a problem for you, consider using OpenSSL or GnuTLS instead. +NSS http://www.mozilla.org/projects/security/pki/nss/ + + (May be used for SSL/TLS support) Is covered by the MPL[4] license, + the GPL[1] license and the LGPL[3] license. You may choose to license + the code under MPL terms, GPL terms, or LGPL terms. These licenses + grant you different permissions and impose different obligations. You + should select the license that best meets your needs. + c-ares http://daniel.haxx.se/projects/c-ares/license.html (Used for asynchronous name resolves) Uses an MIT license that is very @@ -110,3 +118,5 @@ OpenLDAP http://www.openldap.org/software/release/license.html how to write such an exception to the GPL [3] = LGPL - GNU Lesser General Public License: http://www.gnu.org/licenses/lgpl.html +[4] = MPL - Mozilla Public License: + http://www.mozilla.org/MPL/ -- cgit v1.2.3