summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2015-06-15 10:57:43 +0200
committerDaniel Stenberg <daniel@haxx.se>2015-06-15 10:57:43 +0200
commitbb5b29ec14e81097b22382f879ee39174914e621 (patch)
tree0773be59831a40c1436dc98b8216a05425527334
parent75ba1077674d77594235e18466b6f0b749911c0e (diff)
downloadgnurl-bb5b29ec14e81097b22382f879ee39174914e621.tar.gz
gnurl-bb5b29ec14e81097b22382f879ee39174914e621.tar.bz2
gnurl-bb5b29ec14e81097b22382f879ee39174914e621.zip
LICENSE-MIXING: refreshed
-rw-r--r--docs/LICENSE-MIXING28
1 files changed, 22 insertions, 6 deletions
diff --git a/docs/LICENSE-MIXING b/docs/LICENSE-MIXING
index a53835c4c..d70fa8492 100644
--- a/docs/LICENSE-MIXING
+++ b/docs/LICENSE-MIXING
@@ -30,20 +30,20 @@ OpenSSL http://www.openssl.org/source/license.html
are not allowed to ship binaries that link with OpenSSL that includes
GPL code (unless that specific GPL code includes an exception for
OpenSSL - a habit that is growing more and more common). If OpenSSL's
- licensing is a problem for you, consider using GnuTLS or yassl
- instead.
+ licensing is a problem for you, consider using another TLS library.
GnuTLS http://www.gnutls.org/
(May be used for SSL/TLS support) Uses the LGPL[3] license. If this is
- a problem for you, consider using OpenSSL instead. Also note that
+ a problem for you, consider using another TLS library. Also note that
GnuTLS itself depends on and uses other libs (libgcrypt and
libgpg-error) and they too are LGPL- or GPL-licensed.
-yassl http://www.yassl.com/
+WolfSSL http://www.wolfssl.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.
+ (May be used for SSL/TLS support) Uses the GPL[1] license or a
+ propietary license. If this is a problem for you, consider using
+ another TLS library.
NSS http://www.mozilla.org/projects/security/pki/nss/
@@ -57,6 +57,22 @@ axTLS http://axtls.sourceforge.net/
(May be used for SSL/TLS support) Uses a Modified BSD-style license.
+mbedTLS https://tls.mbed.org/
+
+ (May be used for SSL/TLS support) Uses the GPL[1] license or a
+ propietary license. If this is a problem for you, consider using
+ another TLS library.
+
+BoringSSL https://boringssl.googlesource.com/
+
+ (May be used for SSL/TLS support) As an OpenSSL fork, it has the same
+ license as that.
+
+libressl http://www.libressl.org/
+
+ (May be used for SSL/TLS support) As an OpenSSL fork, it has the same
+ license as that.
+
c-ares http://daniel.haxx.se/projects/c-ares/license.html
(Used for asynchronous name resolves) Uses an MIT license that is very