From e01d0f1030b984e0530f4bcd37896ce73cb663ff Mon Sep 17 00:00:00 2001 From: Tony Kelman Date: Fri, 16 Sep 2016 14:17:05 -0700 Subject: [PATCH] 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 --- docs/LICENSE-MIXING.md | 7 +++++-- 1 file 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 -- 2.40.0