aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Kelman <tony@kelman.net>2016-09-16 14:17:05 -0700
committerDaniel Stenberg <daniel@haxx.se>2016-09-16 23:56:28 +0200
commite01d0f1030b984e0530f4bcd37896ce73cb663ff (patch)
tree355468589ba5f53e1c46b147ca3cc41d719c881e
parent710f0572c9a1a01b824865debe28e96633613592 (diff)
LICENSE-MIXING.md: update with mbedTLS dual licensing
Recent versions of mbedTLS are available under either Apache 2.0 or GPL 2.0, see https://tls.mbed.org/how-to-get Closes #1019
-rw-r--r--docs/LICENSE-MIXING.md7
1 files changed, 5 insertions, 2 deletions
diff --git a/docs/LICENSE-MIXING.md b/docs/LICENSE-MIXING.md
index 0bff73e6d..d9672c497 100644
--- a/docs/LICENSE-MIXING.md
+++ b/docs/LICENSE-MIXING.md
@@ -63,8 +63,11 @@ not have the announcement clause that collides with GPL.
## mbedTLS
- (May be used for SSL/TLS support) Uses the GPL license or a propietary
- license. If this is a problem for you, consider using another TLS library.
+ (May be used for SSL/TLS support) Uses the [Apache 2.0
+ license](https://opensource.org/licenses/Apache-2.0) or the GPL license.
+ You may choose to license the code under Apache 2.0 terms or GPL terms.
+ These licenses grant you different permissions and impose different
+ obligations. You should select the license that best meets your needs.
## BoringSSL