From de773dd6b6bdd9560aa9befd3854b06025e59d9a Mon Sep 17 00:00:00 2001
From: Josh Tynjala <joshtynjala@bowlerhat.dev>
Date: Tue, 23 May 2023 11:11:04 -0700
Subject: [PATCH] mbedtls v3.3.0

Restores Android NDK r15c compatibility
---
 project/lib/mbedtls           |  2 +-
 project/lib/mbedtls-files.xml | 52 +++++++++++++++++++++++++++--------
 2 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/project/lib/mbedtls b/project/lib/mbedtls
index d65aeb373..8c8922499 160000
--- a/project/lib/mbedtls
+++ b/project/lib/mbedtls
@@ -1 +1 @@
-Subproject commit d65aeb37349ad1a50e0f6c9b694d4b5290d60e49
+Subproject commit 8c89224991adff88d53cd380f42a2baa36f91454
diff --git a/project/lib/mbedtls-files.xml b/project/lib/mbedtls-files.xml
index 37deac26d..1fafa5edd 100644
--- a/project/lib/mbedtls-files.xml
+++ b/project/lib/mbedtls-files.xml
@@ -2,9 +2,9 @@
 
 	<files id="native-toolkit-mbedtls">
 
+		<compilerflag value="-std=c11" />
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/mbedtls/include/" />
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/zlib/" />
-
 		<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/aria.c" />
@@ -12,12 +12,15 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/asn1write.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/base64.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/bignum.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/bignum_core.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/bignum_mod.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/bignum_mod_raw.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/camellia.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ccm.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/chacha20.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/chachapoly.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/cipher_wrap.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/cipher.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/cipher_wrap.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/cmac.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/constant_time.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ctr_drbg.c" />
@@ -27,53 +30,80 @@
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ecdh.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ecdsa.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ecjpake.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ecp_curves.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ecp.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/entropy_poll.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ecp_curves.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/entropy.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/entropy_poll.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/error.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/gcm.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/hash_info.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/hkdf.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/hmac_drbg.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/lmots.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/lms.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/md.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/md5.c" />
 		<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/nist_kw.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/oid.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/padlock.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/pem.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/pk_wrap.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/pk.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/pk_wrap.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/pkcs12.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/pkcs5.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/pkcs7.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/pkparse.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/pkwrite.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/platform_util.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/platform.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/platform_util.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/poly1305.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/psa_crypto.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/psa_crypto_aead.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/psa_crypto_cipher.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/psa_crypto_client.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/psa_crypto_driver_wrappers.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/psa_crypto_ecp.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/psa_crypto_hash.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/psa_crypto_mac.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/psa_crypto_pake.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/psa_crypto_rsa.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/psa_crypto_se.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/psa_crypto_slot_management.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/psa_crypto_storage.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/psa_its_file.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ripemd160.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/rsa_alt_helpers.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/rsa.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/rsa_alt_helpers.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/sha1.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/sha256.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/sha512.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ssl_cache.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ssl_ciphersuites.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ssl_cli.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ssl_client.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ssl_cookie.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ssl_debug_helpers_generated.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ssl_msg.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ssl_srv.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ssl_ticket.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ssl_tls.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ssl_tls12_client.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ssl_tls12_server.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ssl_tls13_client.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ssl_tls13_generic.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ssl_tls13_keys.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/ssl_tls13_server.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/threading.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/timing.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/version_features.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/version.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/version_features.c" />
+		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/x509.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/x509_create.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/x509_crl.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/x509_crt.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/x509_csr.c" />
-		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/x509.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/x509write_crt.c" />
 		<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/x509write_csr.c" />