yassl can be used now

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index fa925c6be37dd50ed088326e5c6d5e47fcc8c42f..06c7d5a34437500546c7a6a30a5b639a7c1cc16f 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -23,6 +23,8 @@ This release includes the following bugfixes:
 
 Other curl-related news:
 
+ o yassl 1.3.7 can now be used with libcurl as an optional TLS library for
+   HTTPS/FTPS support
  o cURLpp 0.6.0 was released: http://rrette.com/curlpp.html
  o pycurl-7.15.4 was released: http://pycurl.sf.net
 

diff --git a/docs/LICENSE-MIXING b/docs/LICENSE-MIXING
index 0cf8a89e70f7ce2b5e996d46b8d66cb165f7de48..60f5f934c2e425948006a246125a6ed1e956db30 100644 (file)
--- a/docs/LICENSE-MIXING
+++ b/docs/LICENSE-MIXING
@@ -32,7 +32,8 @@ 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 instead.
+        licensing is a problem for you, consider using GnuTLS or yassl
+        instead.
 
 GnuTLS  http://www.gnutls.org/
 
@@ -41,6 +42,11 @@ GnuTLS  http://www.gnutls.org/
         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/
+
+        (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.
+
 c-ares  http://daniel.haxx.se/projects/c-ares/license.html
 
         (Used for asynchronous name resolves) Uses an MIT license that is very