From 8d81a0fc8ed3a9f558a44507960b2992816475cc Mon Sep 17 00:00:00 2001
From: Apprentice-Alchemist
 <53486764+Apprentice-Alchemist@users.noreply.github.com>
Date: Wed, 7 Aug 2024 23:06:05 +0200
Subject: [PATCH] HashLink 1.14 (closes #1827) (closes #1801) (closes #1967)

Co-Authored-By: Josh Tynjala <joshtynjala@users.noreply.github.com>
---
 project/Build.xml                         |   2 +
 project/BuildHashlink.xml                 | 139 +++++++---------------
 project/lib/custom/hl-ssl/threading_alt.h |   6 +
 project/lib/hashlink                      |   2 +-
 project/lib/mbedtls-files.xml             |   8 +-
 src/lime/tools/HashlinkHelper.hx          |   2 +-
 6 files changed, 58 insertions(+), 101 deletions(-)
 create mode 100644 project/lib/custom/hl-ssl/threading_alt.h

diff --git a/project/Build.xml b/project/Build.xml
index 21d590328..6fdad5e64 100755
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -55,6 +55,8 @@
 
 	<files id="lime">
 
+		<!-- setting HXCPP_CPP11 doesn't seem to apply to .mm files -->
+        <compilerflag value="-std=c++11" unless="isMsvc" />
 		<compilerflag value="-Iinclude" />
 
 		<file name="src/ExternalInterface.cpp" />
diff --git a/project/BuildHashlink.xml b/project/BuildHashlink.xml
index c9e83b019..0ebcaec92 100644
--- a/project/BuildHashlink.xml
+++ b/project/BuildHashlink.xml
@@ -7,8 +7,11 @@
 	<set name="ios" value="1" if="iphone" />
 	<set name="tvos" value="1" if="appletv" />
 
+	<set name="NATIVE_TOOLKIT_PATH" value="lib" unless="NATIVE_TOOLKIT_PATH"/>
 	<set name="HASHLINK_PATH" value="lib/hashlink" unless="HASHLINK_PATH" />
 
+	<include name="lib/mbedtls-files.xml"/>
+
 	<files id="hl">
 		<compilerflag value="-I${HASHLINK_PATH}/src" />
 
@@ -24,6 +27,8 @@
 	<files id="libhl">
 		<compilerflag value="-std=c11" unless="windows" />
 		<compilerflag value="-DLIBHL_EXPORTS" />
+		<compilerflag value="-DHAVE_CONFIG_H" />
+		<compilerflag value="-DPCRE2_CODE_UNIT_WIDTH=16" />
 
 		<compilerflag value="-I${HASHLINK_PATH}/src" />
 		<compilerflag value="-I${HASHLINK_PATH}/include" />
@@ -56,19 +61,34 @@
 		<file name="${HASHLINK_PATH}/src/std/ucs2.c" />
 
 		<!-- PCRE -->
-		<file name="${HASHLINK_PATH}/include/pcre/pcre16_ord2utf16.c" />
-		<file name="${HASHLINK_PATH}/include/pcre/pcre_globals.c" />
-		<file name="${HASHLINK_PATH}/include/pcre/pcre16_valid_utf16.c" />
-		<file name="${HASHLINK_PATH}/include/pcre/pcre_newline.c" />
-		<file name="${HASHLINK_PATH}/include/pcre/pcre_chartables.c" />
-		<file name="${HASHLINK_PATH}/include/pcre/pcre_string_utils.c" />
-		<file name="${HASHLINK_PATH}/include/pcre/pcre_compile.c" />
-		<file name="${HASHLINK_PATH}/include/pcre/pcre_tables.c" />
-		<file name="${HASHLINK_PATH}/include/pcre/pcre_dfa_exec.c" />
-		<file name="${HASHLINK_PATH}/include/pcre/pcre_ucd.c" />
-		<file name="${HASHLINK_PATH}/include/pcre/pcre_exec.c" />
-		<file name="${HASHLINK_PATH}/include/pcre/pcre_xclass.c" />
-		<file name="${HASHLINK_PATH}/include/pcre/pcre_fullinfo.c" />
+		 <file name="${HASHLINK_PATH}/include/pcre/pcre2_auto_possess.c"/>
+		<file name="${HASHLINK_PATH}/include/pcre/pcre2_chartables.c"/>
+		<file name="${HASHLINK_PATH}/include/pcre/pcre2_compile.c"/>
+		<file name="${HASHLINK_PATH}/include/pcre/pcre2_config.c"/>
+		<file name="${HASHLINK_PATH}/include/pcre/pcre2_context.c"/>
+		<file name="${HASHLINK_PATH}/include/pcre/pcre2_convert.c"/>
+		<file name="${HASHLINK_PATH}/include/pcre/pcre2_dfa_match.c"/>
+		<file name="${HASHLINK_PATH}/include/pcre/pcre2_error.c"/>
+		<file name="${HASHLINK_PATH}/include/pcre/pcre2_extuni.c"/>
+		<file name="${HASHLINK_PATH}/include/pcre/pcre2_find_bracket.c"/>
+		<file name="${HASHLINK_PATH}/include/pcre/pcre2_jit_compile.c"/>
+		<file name="${HASHLINK_PATH}/include/pcre/pcre2_maketables.c"/>
+		<file name="${HASHLINK_PATH}/include/pcre/pcre2_match.c"/>
+		<file name="${HASHLINK_PATH}/include/pcre/pcre2_match_data.c"/>
+		<file name="${HASHLINK_PATH}/include/pcre/pcre2_newline.c"/>
+		<file name="${HASHLINK_PATH}/include/pcre/pcre2_ord2utf.c"/>
+		<file name="${HASHLINK_PATH}/include/pcre/pcre2_pattern_info.c"/>
+		<file name="${HASHLINK_PATH}/include/pcre/pcre2_script_run.c"/>
+		<file name="${HASHLINK_PATH}/include/pcre/pcre2_serialize.c"/>
+		<file name="${HASHLINK_PATH}/include/pcre/pcre2_string_utils.c"/>
+		<file name="${HASHLINK_PATH}/include/pcre/pcre2_study.c"/>
+		<file name="${HASHLINK_PATH}/include/pcre/pcre2_substitute.c"/>
+		<file name="${HASHLINK_PATH}/include/pcre/pcre2_substring.c"/>
+		<file name="${HASHLINK_PATH}/include/pcre/pcre2_tables.c"/>
+		<file name="${HASHLINK_PATH}/include/pcre/pcre2_ucd.c"/>
+		<file name="${HASHLINK_PATH}/include/pcre/pcre2_ucptables.c"/>
+		<file name="${HASHLINK_PATH}/include/pcre/pcre2_valid_utf.c"/>
+		<file name="${HASHLINK_PATH}/include/pcre/pcre2_xclass.c"/>
 
 		<!-- macOS debugging -->
 		<file name="${HASHLINK_PATH}/include/mdbg/mdbg.c" if="mac" />
@@ -78,84 +98,15 @@
 
 	<files id="ssl">
 		<compilerflag value="-I${HASHLINK_PATH}/src" />
-		<compilerflag value="-I${HASHLINK_PATH}/include/mbedtls/include" />
-
+		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/custom/hl-ssl" />
+		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/mbedtls/include" />
+		<compilerflag value="-D_UNICODE" if="windows"/>
+		<compilerflag value="-DUNICODE" if="windows"/>
+		<compilerflag value="-DMBEDTLS_THREADING_C"/>
+		<compilerflag value="-DMBEDTLS_THREADING_PTHREAD" unless="windows"/>
+		<compilerflag value="-DMBEDTLS_THREADING_ALT" if="windows"/>
+		<compilerflag value="/std:c11" if="windows"/>
 		<file name="${HASHLINK_PATH}/libs/ssl/ssl.c" />
-
-		<compilerflag value="-I/usr/local/include" if="mac"/>
-
-		<section if="windows">
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/aes.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/aesni.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/arc4.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/asn1parse.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/asn1write.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/base64.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/bignum.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/blowfish.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/camellia.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/ccm.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/certs.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/cipher.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/cipher_wrap.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/ctr_drbg.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/debug.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/des.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/dhm.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/ecdh.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/ecdsa.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/ecjpake.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/ecp.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/ecp_curves.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/entropy.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/entropy_poll.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/error.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/gcm.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/havege.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/hmac_drbg.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/md.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/md2.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/md4.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/md5.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/md_wrap.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/memory_buffer_alloc.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/oid.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/padlock.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/pem.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/pk.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/pkcs11.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/pkcs12.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/pkcs5.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/pkparse.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/pkwrite.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/pk_wrap.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/platform.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/ripemd160.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/rsa.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/rsa_internal.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/sha1.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/sha256.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/sha512.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/ssl_cache.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/ssl_ciphersuites.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/ssl_cli.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/ssl_cookie.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/ssl_srv.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/ssl_ticket.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/ssl_tls.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/threading.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/timing.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/version.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/version_features.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/x509.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/x509write_crt.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/x509write_csr.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/x509_create.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/x509_crl.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/x509_crt.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/x509_csr.c" />
-			<file name="${HASHLINK_PATH}/include/mbedtls/library/xtea.c" />
-		</section>
 	</files>
 
 	<files id="mysql">
@@ -371,6 +322,7 @@
 		<outdir name="${OUTPUT_DIR}/${BINDIR}" />
 		<ext value=".hdll" />
 		<files id="ssl" />
+		<files id="native-toolkit-mbedtls"/>
 
 		<vflag name="-install_name" value="@executable_path/ssl.hdll" if="mac"/>
 
@@ -383,13 +335,6 @@
 		<lib name="Crypt32.lib" if="windows" />
 		<lib name="ws2_32.lib" if="windows" />
 
-		<!-- Find homebrews mbedtls -->
-		<lib name="-L/usr/local/lib" if="mac" />
-
-		<lib name="-lmbedtls" unless="windows" />
-		<lib name="-lmbedx509" unless="windows" />
-		<lib name="-lmbedcrypto" unless="windows" />
-
 		<vflag name="-framework" value="Security" if="mac || ios || tvos" />
 		<vflag name="-framework" value="CoreFoundation" if="mac || ios || tvos" />
 	</target>
diff --git a/project/lib/custom/hl-ssl/threading_alt.h b/project/lib/custom/hl-ssl/threading_alt.h
new file mode 100644
index 000000000..8a9f80db0
--- /dev/null
+++ b/project/lib/custom/hl-ssl/threading_alt.h
@@ -0,0 +1,6 @@
+#include <windows.h>
+
+typedef struct {
+  CRITICAL_SECTION cs;
+  char is_valid;
+} mbedtls_threading_mutex_t;
diff --git a/project/lib/hashlink b/project/lib/hashlink
index 2be3f7a9e..03110f7e1 160000
--- a/project/lib/hashlink
+++ b/project/lib/hashlink
@@ -1 +1 @@
-Subproject commit 2be3f7a9e633cd8f820a632c8517f72ec6db75e0
+Subproject commit 03110f7e11fb76acf13312864b1d0bb700a6eda4
diff --git a/project/lib/mbedtls-files.xml b/project/lib/mbedtls-files.xml
index 3b5c90dcc..72151ad32 100644
--- a/project/lib/mbedtls-files.xml
+++ b/project/lib/mbedtls-files.xml
@@ -2,9 +2,13 @@
 
 	<files id="native-toolkit-mbedtls">
 
-		<compilerflag value="-std=c11" unless="isMsvc" />
+		<compilerflag value="-std=c11" unless="isMsvc"/>
+		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/custom/hl-ssl" if="HASHLINK_PATH"/>
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/mbedtls/include/" />
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/zlib/" />
+		<compilerflag value="-DMBEDTLS_THREADING_C" if="HASHLINK_PATH"/>
+		<compilerflag value="-DMBEDTLS_THREADING_PTHREAD" unless="windows" if="HASHLINK_PATH"/>
+		<compilerflag value="-DMBEDTLS_THREADING_ALT" if="windows HASHLINK_PATH"/>
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/aes.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/aesni.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/arc4.c" />
@@ -44,7 +48,7 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/memory_buffer_alloc.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/mps_reader.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/mps_trace.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/net_sockets.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/net_sockets.c" unless="HASHLINK_PATH" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/nist_kw.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/oid.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/padlock.c" />
diff --git a/src/lime/tools/HashlinkHelper.hx b/src/lime/tools/HashlinkHelper.hx
index ab6a6e94d..759f47149 100644
--- a/src/lime/tools/HashlinkHelper.hx
+++ b/src/lime/tools/HashlinkHelper.hx
@@ -11,7 +11,7 @@ import hxp.System;
 
 class HashlinkHelper
 {
-	public static inline var BUNDLED_HL_VER = "1.13.0";
+	public static inline var BUNDLED_HL_VER = "1.14.0";
 
 	public static function copyHashlink(project:HXProject, targetDirectory:String, applicationDirectory:String, executablePath:String, ?is64 = true)
 	{