Skip to content

Commit 18b9d68

Browse files
NotHyper-474NotHyper-474
committed
mbedtls shit from upstream (feel free to drop if this conflicts with the original commit)
1 parent 7d05062 commit 18b9d68

File tree

4 files changed

+26
-85
lines changed

4 files changed

+26
-85
lines changed

‎project/Build.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@
5858

5959
<files id="lime">
6060

61+
<!-- setting HXCPP_CPP11 doesn't seem to apply to .mm files -->
62+
<compilerflag value="-std=c++11" unless="isMsvc" />
6163
<compilerflag value="-Iinclude" />
6264

6365
<file name="src/ExternalInterface.cpp" />

‎project/BuildHashlink.xml‎

Lines changed: 12 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@
66
<set name="ios" value="1" if="iphone" />
77
<set name="tvos" value="1" if="appletv" />
88

9+
<set name="NATIVE_TOOLKIT_PATH" value="lib" unless="NATIVE_TOOLKIT_PATH"/>
910
<set name="HASHLINK_PATH" value="lib/hashlink" unless="HASHLINK_PATH" />
1011

12+
<include name="lib/mbedtls-files.xml"/>
13+
1114
<files id="hl">
1215
<compilerflag value="-I${HASHLINK_PATH}/src" />
1316

@@ -95,84 +98,15 @@
9598

9699
<files id="ssl">
97100
<compilerflag value="-I${HASHLINK_PATH}/src" />
98-
<compilerflag value="-I${HASHLINK_PATH}/include/mbedtls/include" />
99-
101+
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/custom/hl-ssl" />
102+
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/mbedtls/include" />
103+
<compilerflag value="-D_UNICODE" if="windows"/>
104+
<compilerflag value="-DUNICODE" if="windows"/>
105+
<compilerflag value="-DMBEDTLS_THREADING_C"/>
106+
<compilerflag value="-DMBEDTLS_THREADING_PTHREAD" unless="windows"/>
107+
<compilerflag value="-DMBEDTLS_THREADING_ALT" if="windows"/>
108+
<compilerflag value="/std:c11" if="windows"/>
100109
<file name="${HASHLINK_PATH}/libs/ssl/ssl.c" />
101-
102-
<compilerflag value="-I/usr/local/include" if="mac"/>
103-
104-
<section if="windows">
105-
<file name="${HASHLINK_PATH}/include/mbedtls/library/aes.c" />
106-
<file name="${HASHLINK_PATH}/include/mbedtls/library/aesni.c" />
107-
<file name="${HASHLINK_PATH}/include/mbedtls/library/arc4.c" />
108-
<file name="${HASHLINK_PATH}/include/mbedtls/library/asn1parse.c" />
109-
<file name="${HASHLINK_PATH}/include/mbedtls/library/asn1write.c" />
110-
<file name="${HASHLINK_PATH}/include/mbedtls/library/base64.c" />
111-
<file name="${HASHLINK_PATH}/include/mbedtls/library/bignum.c" />
112-
<file name="${HASHLINK_PATH}/include/mbedtls/library/blowfish.c" />
113-
<file name="${HASHLINK_PATH}/include/mbedtls/library/camellia.c" />
114-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ccm.c" />
115-
<file name="${HASHLINK_PATH}/include/mbedtls/library/certs.c" />
116-
<file name="${HASHLINK_PATH}/include/mbedtls/library/cipher.c" />
117-
<file name="${HASHLINK_PATH}/include/mbedtls/library/cipher_wrap.c" />
118-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ctr_drbg.c" />
119-
<file name="${HASHLINK_PATH}/include/mbedtls/library/debug.c" />
120-
<file name="${HASHLINK_PATH}/include/mbedtls/library/des.c" />
121-
<file name="${HASHLINK_PATH}/include/mbedtls/library/dhm.c" />
122-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ecdh.c" />
123-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ecdsa.c" />
124-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ecjpake.c" />
125-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ecp.c" />
126-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ecp_curves.c" />
127-
<file name="${HASHLINK_PATH}/include/mbedtls/library/entropy.c" />
128-
<file name="${HASHLINK_PATH}/include/mbedtls/library/entropy_poll.c" />
129-
<file name="${HASHLINK_PATH}/include/mbedtls/library/error.c" />
130-
<file name="${HASHLINK_PATH}/include/mbedtls/library/gcm.c" />
131-
<file name="${HASHLINK_PATH}/include/mbedtls/library/havege.c" />
132-
<file name="${HASHLINK_PATH}/include/mbedtls/library/hmac_drbg.c" />
133-
<file name="${HASHLINK_PATH}/include/mbedtls/library/md.c" />
134-
<file name="${HASHLINK_PATH}/include/mbedtls/library/md2.c" />
135-
<file name="${HASHLINK_PATH}/include/mbedtls/library/md4.c" />
136-
<file name="${HASHLINK_PATH}/include/mbedtls/library/md5.c" />
137-
<file name="${HASHLINK_PATH}/include/mbedtls/library/md_wrap.c" />
138-
<file name="${HASHLINK_PATH}/include/mbedtls/library/memory_buffer_alloc.c" />
139-
<file name="${HASHLINK_PATH}/include/mbedtls/library/oid.c" />
140-
<file name="${HASHLINK_PATH}/include/mbedtls/library/padlock.c" />
141-
<file name="${HASHLINK_PATH}/include/mbedtls/library/pem.c" />
142-
<file name="${HASHLINK_PATH}/include/mbedtls/library/pk.c" />
143-
<file name="${HASHLINK_PATH}/include/mbedtls/library/pkcs11.c" />
144-
<file name="${HASHLINK_PATH}/include/mbedtls/library/pkcs12.c" />
145-
<file name="${HASHLINK_PATH}/include/mbedtls/library/pkcs5.c" />
146-
<file name="${HASHLINK_PATH}/include/mbedtls/library/pkparse.c" />
147-
<file name="${HASHLINK_PATH}/include/mbedtls/library/pkwrite.c" />
148-
<file name="${HASHLINK_PATH}/include/mbedtls/library/pk_wrap.c" />
149-
<file name="${HASHLINK_PATH}/include/mbedtls/library/platform.c" />
150-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ripemd160.c" />
151-
<file name="${HASHLINK_PATH}/include/mbedtls/library/rsa.c" />
152-
<file name="${HASHLINK_PATH}/include/mbedtls/library/rsa_internal.c" />
153-
<file name="${HASHLINK_PATH}/include/mbedtls/library/sha1.c" />
154-
<file name="${HASHLINK_PATH}/include/mbedtls/library/sha256.c" />
155-
<file name="${HASHLINK_PATH}/include/mbedtls/library/sha512.c" />
156-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ssl_cache.c" />
157-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ssl_ciphersuites.c" />
158-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ssl_cli.c" />
159-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ssl_cookie.c" />
160-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ssl_srv.c" />
161-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ssl_ticket.c" />
162-
<file name="${HASHLINK_PATH}/include/mbedtls/library/ssl_tls.c" />
163-
<file name="${HASHLINK_PATH}/include/mbedtls/library/threading.c" />
164-
<file name="${HASHLINK_PATH}/include/mbedtls/library/timing.c" />
165-
<file name="${HASHLINK_PATH}/include/mbedtls/library/version.c" />
166-
<file name="${HASHLINK_PATH}/include/mbedtls/library/version_features.c" />
167-
<file name="${HASHLINK_PATH}/include/mbedtls/library/x509.c" />
168-
<file name="${HASHLINK_PATH}/include/mbedtls/library/x509write_crt.c" />
169-
<file name="${HASHLINK_PATH}/include/mbedtls/library/x509write_csr.c" />
170-
<file name="${HASHLINK_PATH}/include/mbedtls/library/x509_create.c" />
171-
<file name="${HASHLINK_PATH}/include/mbedtls/library/x509_crl.c" />
172-
<file name="${HASHLINK_PATH}/include/mbedtls/library/x509_crt.c" />
173-
<file name="${HASHLINK_PATH}/include/mbedtls/library/x509_csr.c" />
174-
<file name="${HASHLINK_PATH}/include/mbedtls/library/xtea.c" />
175-
</section>
176110
</files>
177111

178112
<files id="mysql">
@@ -388,6 +322,7 @@
388322
<outdir name="${OUTPUT_DIR}/${BINDIR}" />
389323
<ext value=".hdll" />
390324
<files id="ssl" />
325+
<files id="native-toolkit-mbedtls"/>
391326

392327
<vflag name="-install_name" value="@executable_path/ssl.hdll" if="mac"/>
393328

@@ -400,13 +335,6 @@
400335
<lib name="Crypt32.lib" if="windows" />
401336
<lib name="ws2_32.lib" if="windows" />
402337

403-
<!-- Find homebrews mbedtls -->
404-
<lib name="-L/usr/local/lib" if="mac" />
405-
406-
<lib name="-lmbedtls" unless="windows" />
407-
<lib name="-lmbedx509" unless="windows" />
408-
<lib name="-lmbedcrypto" unless="windows" />
409-
410338
<vflag name="-framework" value="Security" if="mac || ios || tvos" />
411339
<vflag name="-framework" value="CoreFoundation" if="mac || ios || tvos" />
412340
</target>

‎project/lib/custom/hl-ssl/threading_alt.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#include <windows.h>
2+
3+
typedef struct {
4+
CRITICAL_SECTION cs;
5+
char is_valid;
6+
} mbedtls_threading_mutex_t;

‎project/lib/mbedtls-files.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@
22

33
<files id="native-toolkit-mbedtls">
44

5+
<compilerflag value="-std=c11" unless="isMsvc" />
6+
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/custom/hl-ssl" if="HASHLINK_PATH"/>
57
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/mbedtls/include/" />
68
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/zlib/" />
9+
<compilerflag value="-DMBEDTLS_THREADING_C" if="HASHLINK_PATH"/>
10+
<compilerflag value="-DMBEDTLS_THREADING_PTHREAD" unless="windows" if="HASHLINK_PATH"/>
11+
<compilerflag value="-DMBEDTLS_THREADING_ALT" if="windows HASHLINK_PATH"/>
712
<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/aes.c" />
813
<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/aesni.c" />
914
<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/arc4.c" />
@@ -43,7 +48,7 @@
4348
<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/memory_buffer_alloc.c" />
4449
<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/mps_reader.c" />
4550
<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/mps_trace.c" />
46-
<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/net_sockets.c" />
51+
<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/net_sockets.c" unless="HASHLINK_PATH" />
4752
<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/nist_kw.c" />
4853
<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/oid.c" />
4954
<file name="${NATIVE_TOOLKIT_PATH}/mbedtls/library/padlock.c" />

0 commit comments

Comments
 (0)