Skip to content

Commit 6d0b37b

Browse files
tobil4sktobil4sk
authored
[ssl] Separate mbedtls c files from SSL.cpp (HaxeFoundation#1125)
* [ssl] Separate mbedtls c files from SSL.cpp * [ssl] Remove mbedtls depend on hxcpp-depends
1 parent 9cdfc47 commit 6d0b37b

File tree

1 file changed

+111
-102
lines changed

1 file changed

+111
-102
lines changed

‎src/hx/libs/ssl/Build.xml

Lines changed: 111 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -4,119 +4,128 @@
44

55
<set name="MBEDTLS_DIR" value="${HXCPP}/project/thirdparty/mbedtls-2.28.2" />
66

7-
<files id="hxcpp_ssl" >
8-
<depend files="hxcpp-depends"/>
7+
<files id="mbedtls">
98
<depend name="${this_dir}/Build.xml" dateOnly="true" />
109
<cache value="true" asLibrary="true" />
11-
<compilerflag value="-I${MBEDTLS_DIR}/include"/>
12-
<compilerflag value="-I${this_dir}"/>
10+
11+
<compilerflag value="-I${MBEDTLS_DIR}/include" />
12+
<compilerflag value="-I${this_dir}" />
1313
<compilerflag value="-std=c99" unless="MSVC_VER" />
14+
<compilerflag value="-DMBEDTLS_USER_CONFIG_FILE=&lt;mbedtls_config.h&gt;" />
1415

15-
<file name="${this_dir}/SSL.cpp"/>
16+
<file name="${MBEDTLS_DIR}/library/aes.c" />
17+
<file name="${MBEDTLS_DIR}/library/aesni.c" />
18+
<file name="${MBEDTLS_DIR}/library/arc4.c" />
19+
<file name="${MBEDTLS_DIR}/library/aria.c" />
20+
<file name="${MBEDTLS_DIR}/library/asn1parse.c" />
21+
<file name="${MBEDTLS_DIR}/library/asn1write.c" />
22+
<file name="${MBEDTLS_DIR}/library/base64.c" />
23+
<file name="${MBEDTLS_DIR}/library/bignum.c" />
24+
<file name="${MBEDTLS_DIR}/library/blowfish.c" />
25+
<file name="${MBEDTLS_DIR}/library/camellia.c" />
26+
<file name="${MBEDTLS_DIR}/library/ccm.c" />
27+
<file name="${MBEDTLS_DIR}/library/chacha20.c" />
28+
<file name="${MBEDTLS_DIR}/library/chachapoly.c" />
29+
<file name="${MBEDTLS_DIR}/library/cipher.c" />
30+
<file name="${MBEDTLS_DIR}/library/cipher_wrap.c" />
31+
<file name="${MBEDTLS_DIR}/library/constant_time.c" />
32+
<file name="${MBEDTLS_DIR}/library/cmac.c" />
33+
<file name="${MBEDTLS_DIR}/library/ctr_drbg.c" />
34+
<file name="${MBEDTLS_DIR}/library/des.c" />
35+
<file name="${MBEDTLS_DIR}/library/dhm.c" />
36+
<file name="${MBEDTLS_DIR}/library/ecdh.c" />
37+
<file name="${MBEDTLS_DIR}/library/ecdsa.c" />
38+
<file name="${MBEDTLS_DIR}/library/ecjpake.c" />
39+
<file name="${MBEDTLS_DIR}/library/ecp.c" />
40+
<file name="${MBEDTLS_DIR}/library/ecp_curves.c" />
41+
<file name="${MBEDTLS_DIR}/library/entropy.c" />
42+
<file name="${MBEDTLS_DIR}/library/entropy_poll.c" />
43+
<file name="${MBEDTLS_DIR}/library/error.c" />
44+
<file name="${MBEDTLS_DIR}/library/gcm.c" />
45+
<file name="${MBEDTLS_DIR}/library/havege.c" />
46+
<file name="${MBEDTLS_DIR}/library/hkdf.c" />
47+
<file name="${MBEDTLS_DIR}/library/hmac_drbg.c" />
48+
<file name="${MBEDTLS_DIR}/library/md.c" />
49+
<file name="${MBEDTLS_DIR}/library/md2.c" />
50+
<file name="${MBEDTLS_DIR}/library/md4.c" />
51+
<file name="${MBEDTLS_DIR}/library/md5.c" />
52+
<file name="${MBEDTLS_DIR}/library/memory_buffer_alloc.c" />
53+
<file name="${MBEDTLS_DIR}/library/mps_reader.c" />
54+
<file name="${MBEDTLS_DIR}/library/mps_trace.c" />
55+
<file name="${MBEDTLS_DIR}/library/nist_kw.c" />
56+
<file name="${MBEDTLS_DIR}/library/oid.c" />
57+
<file name="${MBEDTLS_DIR}/library/padlock.c" />
58+
<file name="${MBEDTLS_DIR}/library/pem.c" />
59+
<file name="${MBEDTLS_DIR}/library/pk.c" />
60+
<file name="${MBEDTLS_DIR}/library/pk_wrap.c" />
61+
<file name="${MBEDTLS_DIR}/library/pkcs12.c" />
62+
<file name="${MBEDTLS_DIR}/library/pkcs5.c" />
63+
<file name="${MBEDTLS_DIR}/library/pkparse.c" />
64+
<file name="${MBEDTLS_DIR}/library/pkwrite.c" />
65+
<file name="${MBEDTLS_DIR}/library/platform.c" />
66+
<file name="${MBEDTLS_DIR}/library/platform_util.c" />
67+
<file name="${MBEDTLS_DIR}/library/poly1305.c" />
68+
<file name="${MBEDTLS_DIR}/library/psa_crypto.c" />
69+
<file name="${MBEDTLS_DIR}/library/psa_crypto_aead.c" />
70+
<file name="${MBEDTLS_DIR}/library/psa_crypto_cipher.c" />
71+
<file name="${MBEDTLS_DIR}/library/psa_crypto_client.c" />
72+
<file name="${MBEDTLS_DIR}/library/psa_crypto_driver_wrappers.c" />
73+
<file name="${MBEDTLS_DIR}/library/psa_crypto_ecp.c" />
74+
<file name="${MBEDTLS_DIR}/library/psa_crypto_hash.c" />
75+
<file name="${MBEDTLS_DIR}/library/psa_crypto_mac.c" />
76+
<file name="${MBEDTLS_DIR}/library/psa_crypto_rsa.c" />
77+
<file name="${MBEDTLS_DIR}/library/psa_crypto_se.c" />
78+
<file name="${MBEDTLS_DIR}/library/psa_crypto_slot_management.c" />
79+
<file name="${MBEDTLS_DIR}/library/psa_crypto_storage.c" />
80+
<file name="${MBEDTLS_DIR}/library/psa_its_file.c" />
81+
<file name="${MBEDTLS_DIR}/library/ripemd160.c" />
82+
<file name="${MBEDTLS_DIR}/library/rsa.c" />
83+
<file name="${MBEDTLS_DIR}/library/rsa_internal.c" />
84+
<file name="${MBEDTLS_DIR}/library/sha1.c" />
85+
<file name="${MBEDTLS_DIR}/library/sha256.c" />
86+
<file name="${MBEDTLS_DIR}/library/sha512.c" />
87+
<file name="${MBEDTLS_DIR}/library/threading.c" />
88+
<file name="${MBEDTLS_DIR}/library/timing.c" />
89+
<file name="${MBEDTLS_DIR}/library/version.c" />
90+
<file name="${MBEDTLS_DIR}/library/version_features.c" />
91+
<file name="${MBEDTLS_DIR}/library/xtea.c" />
1692

17-
<compilerflag value="-DMBEDTLS_USER_CONFIG_FILE=&lt;mbedtls_config.h&gt;"/>
93+
<file name="${MBEDTLS_DIR}/library/certs.c" />
94+
<file name="${MBEDTLS_DIR}/library/pkcs11.c" />
95+
<file name="${MBEDTLS_DIR}/library/x509.c" />
96+
<file name="${MBEDTLS_DIR}/library/x509_create.c" />
97+
<file name="${MBEDTLS_DIR}/library/x509_crl.c" />
98+
<file name="${MBEDTLS_DIR}/library/x509_crt.c" />
99+
<file name="${MBEDTLS_DIR}/library/x509_csr.c" />
100+
<file name="${MBEDTLS_DIR}/library/x509write_crt.c" />
101+
<file name="${MBEDTLS_DIR}/library/x509write_csr.c" />
18102

19-
<file name="${MBEDTLS_DIR}/library/aes.c"/>
20-
<file name="${MBEDTLS_DIR}/library/aesni.c"/>
21-
<file name="${MBEDTLS_DIR}/library/arc4.c"/>
22-
<file name="${MBEDTLS_DIR}/library/aria.c"/>
23-
<file name="${MBEDTLS_DIR}/library/asn1parse.c"/>
24-
<file name="${MBEDTLS_DIR}/library/asn1write.c"/>
25-
<file name="${MBEDTLS_DIR}/library/base64.c"/>
26-
<file name="${MBEDTLS_DIR}/library/bignum.c"/>
27-
<file name="${MBEDTLS_DIR}/library/blowfish.c"/>
28-
<file name="${MBEDTLS_DIR}/library/camellia.c"/>
29-
<file name="${MBEDTLS_DIR}/library/ccm.c"/>
30-
<file name="${MBEDTLS_DIR}/library/chacha20.c"/>
31-
<file name="${MBEDTLS_DIR}/library/chachapoly.c"/>
32-
<file name="${MBEDTLS_DIR}/library/cipher.c"/>
33-
<file name="${MBEDTLS_DIR}/library/cipher_wrap.c"/>
34-
<file name="${MBEDTLS_DIR}/library/constant_time.c"/>
35-
<file name="${MBEDTLS_DIR}/library/cmac.c"/>
36-
<file name="${MBEDTLS_DIR}/library/ctr_drbg.c"/>
37-
<file name="${MBEDTLS_DIR}/library/des.c"/>
38-
<file name="${MBEDTLS_DIR}/library/dhm.c"/>
39-
<file name="${MBEDTLS_DIR}/library/ecdh.c"/>
40-
<file name="${MBEDTLS_DIR}/library/ecdsa.c"/>
41-
<file name="${MBEDTLS_DIR}/library/ecjpake.c"/>
42-
<file name="${MBEDTLS_DIR}/library/ecp.c"/>
43-
<file name="${MBEDTLS_DIR}/library/ecp_curves.c"/>
44-
<file name="${MBEDTLS_DIR}/library/entropy.c"/>
45-
<file name="${MBEDTLS_DIR}/library/entropy_poll.c"/>
46-
<file name="${MBEDTLS_DIR}/library/error.c"/>
47-
<file name="${MBEDTLS_DIR}/library/gcm.c"/>
48-
<file name="${MBEDTLS_DIR}/library/havege.c"/>
49-
<file name="${MBEDTLS_DIR}/library/hkdf.c"/>
50-
<file name="${MBEDTLS_DIR}/library/hmac_drbg.c"/>
51-
<file name="${MBEDTLS_DIR}/library/md.c"/>
52-
<file name="${MBEDTLS_DIR}/library/md2.c"/>
53-
<file name="${MBEDTLS_DIR}/library/md4.c"/>
54-
<file name="${MBEDTLS_DIR}/library/md5.c"/>
55-
<file name="${MBEDTLS_DIR}/library/memory_buffer_alloc.c"/>
56-
<file name="${MBEDTLS_DIR}/library/mps_reader.c"/>
57-
<file name="${MBEDTLS_DIR}/library/mps_trace.c"/>
58-
<file name="${MBEDTLS_DIR}/library/nist_kw.c"/>
59-
<file name="${MBEDTLS_DIR}/library/oid.c"/>
60-
<file name="${MBEDTLS_DIR}/library/padlock.c"/>
61-
<file name="${MBEDTLS_DIR}/library/pem.c"/>
62-
<file name="${MBEDTLS_DIR}/library/pk.c"/>
63-
<file name="${MBEDTLS_DIR}/library/pk_wrap.c"/>
64-
<file name="${MBEDTLS_DIR}/library/pkcs12.c"/>
65-
<file name="${MBEDTLS_DIR}/library/pkcs5.c"/>
66-
<file name="${MBEDTLS_DIR}/library/pkparse.c"/>
67-
<file name="${MBEDTLS_DIR}/library/pkwrite.c"/>
68-
<file name="${MBEDTLS_DIR}/library/platform.c"/>
69-
<file name="${MBEDTLS_DIR}/library/platform_util.c"/>
70-
<file name="${MBEDTLS_DIR}/library/poly1305.c"/>
71-
<file name="${MBEDTLS_DIR}/library/psa_crypto.c"/>
72-
<file name="${MBEDTLS_DIR}/library/psa_crypto_aead.c"/>
73-
<file name="${MBEDTLS_DIR}/library/psa_crypto_cipher.c"/>
74-
<file name="${MBEDTLS_DIR}/library/psa_crypto_client.c"/>
75-
<file name="${MBEDTLS_DIR}/library/psa_crypto_driver_wrappers.c"/>
76-
<file name="${MBEDTLS_DIR}/library/psa_crypto_ecp.c"/>
77-
<file name="${MBEDTLS_DIR}/library/psa_crypto_hash.c"/>
78-
<file name="${MBEDTLS_DIR}/library/psa_crypto_mac.c"/>
79-
<file name="${MBEDTLS_DIR}/library/psa_crypto_rsa.c"/>
80-
<file name="${MBEDTLS_DIR}/library/psa_crypto_se.c"/>
81-
<file name="${MBEDTLS_DIR}/library/psa_crypto_slot_management.c"/>
82-
<file name="${MBEDTLS_DIR}/library/psa_crypto_storage.c"/>
83-
<file name="${MBEDTLS_DIR}/library/psa_its_file.c"/>
84-
<file name="${MBEDTLS_DIR}/library/ripemd160.c"/>
85-
<file name="${MBEDTLS_DIR}/library/rsa.c"/>
86-
<file name="${MBEDTLS_DIR}/library/rsa_internal.c"/>
87-
<file name="${MBEDTLS_DIR}/library/sha1.c"/>
88-
<file name="${MBEDTLS_DIR}/library/sha256.c"/>
89-
<file name="${MBEDTLS_DIR}/library/sha512.c"/>
90-
<file name="${MBEDTLS_DIR}/library/threading.c"/>
91-
<file name="${MBEDTLS_DIR}/library/timing.c"/>
92-
<file name="${MBEDTLS_DIR}/library/version.c"/>
93-
<file name="${MBEDTLS_DIR}/library/version_features.c"/>
94-
<file name="${MBEDTLS_DIR}/library/xtea.c"/>
103+
<file name="${MBEDTLS_DIR}/library/debug.c" />
104+
<file name="${MBEDTLS_DIR}/library/net_sockets.c" />
105+
<file name="${MBEDTLS_DIR}/library/ssl_cache.c" />
106+
<file name="${MBEDTLS_DIR}/library/ssl_ciphersuites.c" />
107+
<file name="${MBEDTLS_DIR}/library/ssl_cli.c" />
108+
<file name="${MBEDTLS_DIR}/library/ssl_cookie.c" />
109+
<file name="${MBEDTLS_DIR}/library/ssl_msg.c" />
110+
<file name="${MBEDTLS_DIR}/library/ssl_srv.c" />
111+
<file name="${MBEDTLS_DIR}/library/ssl_ticket.c" />
112+
<file name="${MBEDTLS_DIR}/library/ssl_tls.c" />
113+
<file name="${MBEDTLS_DIR}/library/ssl_tls13_keys.c" />
114+
</files>
95115

96-
<file name="${MBEDTLS_DIR}/library/certs.c"/>
97-
<file name="${MBEDTLS_DIR}/library/pkcs11.c"/>
98-
<file name="${MBEDTLS_DIR}/library/x509.c"/>
99-
<file name="${MBEDTLS_DIR}/library/x509_create.c"/>
100-
<file name="${MBEDTLS_DIR}/library/x509_crl.c"/>
101-
<file name="${MBEDTLS_DIR}/library/x509_crt.c"/>
102-
<file name="${MBEDTLS_DIR}/library/x509_csr.c"/>
103-
<file name="${MBEDTLS_DIR}/library/x509write_crt.c"/>
104-
<file name="${MBEDTLS_DIR}/library/x509write_csr.c"/>
116+
<files id="hxcpp_ssl" >
117+
<depend files="hxcpp-depends"/>
118+
<depend name="${this_dir}/Build.xml" dateOnly="true" />
119+
<cache value="true" asLibrary="true" />
120+
<compilerflag value="-I${MBEDTLS_DIR}/include"/>
121+
<compilerflag value="-I${this_dir}"/>
122+
<compilerflag value="-DMBEDTLS_USER_CONFIG_FILE=&lt;mbedtls_config.h&gt;"/>
105123

106-
<file name="${MBEDTLS_DIR}/library/debug.c"/>
107-
<file name="${MBEDTLS_DIR}/library/net_sockets.c"/>
108-
<file name="${MBEDTLS_DIR}/library/ssl_cache.c"/>
109-
<file name="${MBEDTLS_DIR}/library/ssl_ciphersuites.c"/>
110-
<file name="${MBEDTLS_DIR}/library/ssl_cli.c"/>
111-
<file name="${MBEDTLS_DIR}/library/ssl_cookie.c"/>
112-
<file name="${MBEDTLS_DIR}/library/ssl_msg.c"/>
113-
<file name="${MBEDTLS_DIR}/library/ssl_srv.c"/>
114-
<file name="${MBEDTLS_DIR}/library/ssl_ticket.c"/>
115-
<file name="${MBEDTLS_DIR}/library/ssl_tls.c"/>
116-
<file name="${MBEDTLS_DIR}/library/ssl_tls13_keys.c"/>
124+
<file name="${this_dir}/SSL.cpp"/>
117125
</files>
118126

119127
<target id="haxe">
128+
<files id="mbedtls" />
120129
<files id="hxcpp_ssl" />
121130

122131
<lib name="advapi32.lib" if="windows" unless="static_link" />

0 commit comments

Comments
 (0)