X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=docs%2FLICENSE-MIXING.md;h=5376bdb70640db3149d054209f047325f56fc29c;hb=24b9957402f17c422eeeb3386bf049feeb342e78;hp=0bff73e6db8f47b297187dc3789e619ef6cc7283;hpb=88d478478059f53e6de0d1267c3a1e6b02c4273f;p=platform%2Fupstream%2Fcurl.git diff --git a/docs/LICENSE-MIXING.md b/docs/LICENSE-MIXING.md index 0bff73e..5376bdb 100644 --- a/docs/LICENSE-MIXING.md +++ b/docs/LICENSE-MIXING.md @@ -45,7 +45,7 @@ not have the announcement clause that collides with GPL. ## WolfSSL - (May be used for SSL/TLS support) Uses the GPL license or a propietary + (May be used for SSL/TLS support) Uses the GPL license or a proprietary license. If this is a problem for you, consider using another TLS library. ## NSS @@ -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