From e08aa05dd31534b12e0b2a08d98df4c99b6a4db1 Mon Sep 17 00:00:00 2001
From: Joshua Granick <jgranick@users.noreply.github.com>
Date: Tue, 7 Nov 2017 15:33:41 -0800
Subject: [PATCH] Upgrade cURL and axTLS, initial integration of mbedTLS

---
 .gitmodules         | 3 +++
 NOTICE.md           | 7 +++++--
 project/Build.xml   | 6 +++++-
 project/lib/axtls   | 2 +-
 project/lib/curl    | 2 +-
 project/lib/mbedtls | 1 +
 6 files changed, 16 insertions(+), 5 deletions(-)
 create mode 160000 project/lib/mbedtls

diff --git a/.gitmodules b/.gitmodules
index 2b7f14f9d..a04e05369 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -55,3 +55,6 @@
 [submodule "project/lib/axtls"]
 	path = project/lib/axtls
 	url = https://github.com/native-toolkit/axtls
+[submodule "project/lib/mbedtls"]
+	path = project/lib/mbedtls
+	url = https://github.com/native-toolkit/mbedtls
diff --git a/NOTICE.md b/NOTICE.md
index ebcc55553..fcf79789f 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -4,13 +4,13 @@ Notices
 ### Lime
 Copyright (c) 2013-2017 Joshua Granick and other Lime contributors
 
-This product bundles axTLS 1.4.9, which is available under a
+This product bundles axTLS 2.1.4, which is available under a
 "BSD" license. For details, see [project/lib/axtls/](project/lib).
 
 This product bundles cairo 1.15.2, which is available under an
 "MPL 1.1" license. For details, see [project/lib/cairo/](project/lib).
 
-This product bundles libcurl 7.37.1, which is available under an
+This product bundles libcurl 7.56.1, which is available under an
 "MIT/X derivate" license. For details, see [project/lib/curl/](project/lib).
 
 This product bundles efsw, which is available under an
@@ -31,6 +31,9 @@ This product bundles libogg 1.3.0, which is available under a
 This product bundles LZMA SDK 4.65, which is available under
 public domain. For details, see [project/lib/lzma/](project/lzma).
 
+This product bundles mbedTLS 2.6.0, which is available under an
+"Apache 2.0" license. For details, see [project/lib/mbedtls/](project/lib).
+
 This product bundles OpenAL-Soft 1.17.2, which is available under an
 "LGPLv3" license. For details, see [project/lib/openal/](project/lib).
 
diff --git a/project/Build.xml b/project/Build.xml
index 2ac4822d4..f363f6c24 100644
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -9,7 +9,7 @@
 	<set name="ios" value="1" if="iphone" />
 	<set name="tvos" value="1" if="appletv" />
 	
-	<set name="LIME_AXTLS" value="1" unless="emscripten" />
+	<set name="LIME_AXTLS" value="1" unless="emscripten || mac" />
 	<set name="LIME_CAIRO" value="1" />
 	<set name="LIME_CURL" value="1" unless="emscripten" />
 	<set name="LIME_EFSW" value="1" if="windows || mac || linux" />
@@ -17,6 +17,7 @@
 	<set name="LIME_FREETYPE" value="1" />
 	<set name="LIME_HARFBUZZ" value="1" />
 	<set name="LIME_LZMA" value="1" />
+	<set name="LIME_MBEDTLS" value="1" if="mac" />
 	<!-- <set name="LIME_NEKO" value="1" if="linux" /> -->
 	<set name="LIME_OGG" value="1" />
 	<set name="LIME_OPENALSOFT" value="1" if="windows || linux || android" unless="static_link" />
@@ -39,6 +40,7 @@
 	
 	<set name="NATIVE_TOOLKIT_HAVE_AXTLS" value="1" if="LIME_AXTLS" />
 	<set name="NATIVE_TOOLKIT_HAVE_HARFBUZZ" value="1" if="LIME_HARFBUZZ" />
+	<set name="NATIVE_TOOLKIT_HAVE_MBEDTLS" value="1" if="LIME_MBEDTLS" />
 	<set name="NATIVE_TOOLKIT_HAVE_PNG" value="1" if="LIME_PNG" />
 	
 	<set name="NATIVE_TOOLKIT_CURL_DISABLE_AXTLS_NONBLOCKING" value="1" />
@@ -300,6 +302,7 @@
 	<include name="lib/harfbuzz/files.xml" />
 	<include name="lib/jpeg/files.xml" />
 	<include name="lib/lzma/files.xml" />
+	<include name="lib/mbedtls/files.xml" />
 	<include name="lib/neko/files.xml" />
 	<include name="lib/ogg/files.xml" />
 	<include name="lib/openal/files.xml" />
@@ -330,6 +333,7 @@
 		<files id="native-toolkit-freetype" if="LIME_FREETYPE" />
 		<files id="native-toolkit-harfbuzz" if="LIME_HARFBUZZ" />
 		<files id="native-toolkit-lzma" if="LIME_LZMA" />
+		<files id="native-toolkit-mbedtls" if="LIME_MBEDTLS" />
 		<files id="native-toolkit-neko" if="LIME_NEKO" />
 		<files id="native-toolkit-ogg" if="LIME_OGG" />
 		<files id="native-toolkit-openal" if="LIME_OPENALSOFT" />
diff --git a/project/lib/axtls b/project/lib/axtls
index 961447ca2..69f8aaa0e 160000
--- a/project/lib/axtls
+++ b/project/lib/axtls
@@ -1 +1 @@
-Subproject commit 961447ca2d56c15b9c7bfe62270d56384ad36371
+Subproject commit 69f8aaa0ed52cf1f1175cacf9f30ad5d7a8d7a74
diff --git a/project/lib/curl b/project/lib/curl
index b97ec6d82..d65a53824 160000
--- a/project/lib/curl
+++ b/project/lib/curl
@@ -1 +1 @@
-Subproject commit b97ec6d82c4b27d89b1f0cf0c103f574c9ece871
+Subproject commit d65a53824cbaa2dab9cc3598fa00f2a3a0593b98
diff --git a/project/lib/mbedtls b/project/lib/mbedtls
new file mode 160000
index 000000000..2014806c6
--- /dev/null
+++ b/project/lib/mbedtls
@@ -0,0 +1 @@
+Subproject commit 2014806c66f52e1dcadcf02b2fdda48d798b2fc1