Skip to content

[ssl] Expose mbedtls xml config for external use #1133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Simn merged 1 commit into from
Jul 25, 2024
Merged

[ssl] Expose mbedtls xml config for external use #1133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 src/hx/libs/ssl/mbedtls_config.h → ...y/config/mbedtls/include/mbedtls_config.h
View file
Open in desktop
File renamed without changes.
0 src/hx/libs/ssl/threading_alt.h → ...ty/config/mbedtls/include/threading_alt.h
View file
Open in desktop
File renamed without changes.
113 changes: 113 additions & 0 deletions project/thirdparty/mbedtls-files.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
<xml>

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

<files id="mbedtls">
<depend name="${this_dir}/mbedtls-files.xml" dateOnly="true" />
<cache value="true" asLibrary="true" />

<include name="${this_dir}/mbedtls-flags.xml" />

<compilerflag value="-std=c99" unless="MSVC_VER" />

<file name="${MBEDTLS_DIR}/library/aes.c" />
<file name="${MBEDTLS_DIR}/library/aesni.c" />
<file name="${MBEDTLS_DIR}/library/arc4.c" />
<file name="${MBEDTLS_DIR}/library/aria.c" />
<file name="${MBEDTLS_DIR}/library/asn1parse.c" />
<file name="${MBEDTLS_DIR}/library/asn1write.c" />
<file name="${MBEDTLS_DIR}/library/base64.c" />
<file name="${MBEDTLS_DIR}/library/bignum.c" />
<file name="${MBEDTLS_DIR}/library/blowfish.c" />
<file name="${MBEDTLS_DIR}/library/camellia.c" />
<file name="${MBEDTLS_DIR}/library/ccm.c" />
<file name="${MBEDTLS_DIR}/library/chacha20.c" />
<file name="${MBEDTLS_DIR}/library/chachapoly.c" />
<file name="${MBEDTLS_DIR}/library/cipher.c" />
<file name="${MBEDTLS_DIR}/library/cipher_wrap.c" />
<file name="${MBEDTLS_DIR}/library/constant_time.c" />
<file name="${MBEDTLS_DIR}/library/cmac.c" />
<file name="${MBEDTLS_DIR}/library/ctr_drbg.c" />
<file name="${MBEDTLS_DIR}/library/des.c" />
<file name="${MBEDTLS_DIR}/library/dhm.c" />
<file name="${MBEDTLS_DIR}/library/ecdh.c" />
<file name="${MBEDTLS_DIR}/library/ecdsa.c" />
<file name="${MBEDTLS_DIR}/library/ecjpake.c" />
<file name="${MBEDTLS_DIR}/library/ecp.c" />
<file name="${MBEDTLS_DIR}/library/ecp_curves.c" />
<file name="${MBEDTLS_DIR}/library/entropy.c" />
<file name="${MBEDTLS_DIR}/library/entropy_poll.c" />
<file name="${MBEDTLS_DIR}/library/error.c" />
<file name="${MBEDTLS_DIR}/library/gcm.c" />
<file name="${MBEDTLS_DIR}/library/havege.c" />
<file name="${MBEDTLS_DIR}/library/hkdf.c" />
<file name="${MBEDTLS_DIR}/library/hmac_drbg.c" />
<file name="${MBEDTLS_DIR}/library/md.c" />
<file name="${MBEDTLS_DIR}/library/md2.c" />
<file name="${MBEDTLS_DIR}/library/md4.c" />
<file name="${MBEDTLS_DIR}/library/md5.c" />
<file name="${MBEDTLS_DIR}/library/memory_buffer_alloc.c" />
<file name="${MBEDTLS_DIR}/library/mps_reader.c" />
<file name="${MBEDTLS_DIR}/library/mps_trace.c" />
<file name="${MBEDTLS_DIR}/library/nist_kw.c" />
<file name="${MBEDTLS_DIR}/library/oid.c" />
<file name="${MBEDTLS_DIR}/library/padlock.c" />
<file name="${MBEDTLS_DIR}/library/pem.c" />
<file name="${MBEDTLS_DIR}/library/pk.c" />
<file name="${MBEDTLS_DIR}/library/pk_wrap.c" />
<file name="${MBEDTLS_DIR}/library/pkcs12.c" />
<file name="${MBEDTLS_DIR}/library/pkcs5.c" />
<file name="${MBEDTLS_DIR}/library/pkparse.c" />
<file name="${MBEDTLS_DIR}/library/pkwrite.c" />
<file name="${MBEDTLS_DIR}/library/platform.c" />
<file name="${MBEDTLS_DIR}/library/platform_util.c" />
<file name="${MBEDTLS_DIR}/library/poly1305.c" />
<file name="${MBEDTLS_DIR}/library/psa_crypto.c" />
<file name="${MBEDTLS_DIR}/library/psa_crypto_aead.c" />
<file name="${MBEDTLS_DIR}/library/psa_crypto_cipher.c" />
<file name="${MBEDTLS_DIR}/library/psa_crypto_client.c" />
<file name="${MBEDTLS_DIR}/library/psa_crypto_driver_wrappers.c" />
<file name="${MBEDTLS_DIR}/library/psa_crypto_ecp.c" />
<file name="${MBEDTLS_DIR}/library/psa_crypto_hash.c" />
<file name="${MBEDTLS_DIR}/library/psa_crypto_mac.c" />
<file name="${MBEDTLS_DIR}/library/psa_crypto_rsa.c" />
<file name="${MBEDTLS_DIR}/library/psa_crypto_se.c" />
<file name="${MBEDTLS_DIR}/library/psa_crypto_slot_management.c" />
<file name="${MBEDTLS_DIR}/library/psa_crypto_storage.c" />
<file name="${MBEDTLS_DIR}/library/psa_its_file.c" />
<file name="${MBEDTLS_DIR}/library/ripemd160.c" />
<file name="${MBEDTLS_DIR}/library/rsa.c" />
<file name="${MBEDTLS_DIR}/library/rsa_internal.c" />
<file name="${MBEDTLS_DIR}/library/sha1.c" />
<file name="${MBEDTLS_DIR}/library/sha256.c" />
<file name="${MBEDTLS_DIR}/library/sha512.c" />
<file name="${MBEDTLS_DIR}/library/threading.c" />
<file name="${MBEDTLS_DIR}/library/timing.c" />
<file name="${MBEDTLS_DIR}/library/version.c" />
<file name="${MBEDTLS_DIR}/library/version_features.c" />
<file name="${MBEDTLS_DIR}/library/xtea.c" />

<file name="${MBEDTLS_DIR}/library/certs.c" />
<file name="${MBEDTLS_DIR}/library/pkcs11.c" />
<file name="${MBEDTLS_DIR}/library/x509.c" />
<file name="${MBEDTLS_DIR}/library/x509_create.c" />
<file name="${MBEDTLS_DIR}/library/x509_crl.c" />
<file name="${MBEDTLS_DIR}/library/x509_crt.c" />
<file name="${MBEDTLS_DIR}/library/x509_csr.c" />
<file name="${MBEDTLS_DIR}/library/x509write_crt.c" />
<file name="${MBEDTLS_DIR}/library/x509write_csr.c" />

<file name="${MBEDTLS_DIR}/library/debug.c" />
<file name="${MBEDTLS_DIR}/library/net_sockets.c" />
<file name="${MBEDTLS_DIR}/library/ssl_cache.c" />
<file name="${MBEDTLS_DIR}/library/ssl_ciphersuites.c" />
<file name="${MBEDTLS_DIR}/library/ssl_cli.c" />
<file name="${MBEDTLS_DIR}/library/ssl_cookie.c" />
<file name="${MBEDTLS_DIR}/library/ssl_msg.c" />
<file name="${MBEDTLS_DIR}/library/ssl_srv.c" />
<file name="${MBEDTLS_DIR}/library/ssl_ticket.c" />
<file name="${MBEDTLS_DIR}/library/ssl_tls.c" />
<file name="${MBEDTLS_DIR}/library/ssl_tls13_keys.c" />
</files>

</xml>
9 changes: 9 additions & 0 deletions project/thirdparty/mbedtls-flags.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<xml>

<depend name="${HXCPP}/project/thirdparty/mbedtls-flags.xml" dateOnly="true" />

<compilerflag value="-I${HXCPP}/project/thirdparty/mbedtls-2.28.2/include" />
<compilerflag value="-I${HXCPP}/project/thirdparty/config/mbedtls/include" />
<compilerflag value="-DMBEDTLS_USER_CONFIG_FILE=&lt;mbedtls_config.h&gt;" />

</xml>
116 changes: 3 additions & 113 deletions src/hx/libs/ssl/Build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,124 +2,14 @@

<pragma once="true" />

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

<files id="mbedtls">
<depend name="${this_dir}/Build.xml" dateOnly="true" />
<cache value="true" asLibrary="true" />

<compilerflag value="-I${MBEDTLS_DIR}/include" />
<compilerflag value="-I${this_dir}" />
<compilerflag value="-std=c99" unless="MSVC_VER" />
<compilerflag value="-DMBEDTLS_USER_CONFIG_FILE=&lt;mbedtls_config.h&gt;" />

<file name="${MBEDTLS_DIR}/library/aes.c" />
<file name="${MBEDTLS_DIR}/library/aesni.c" />
<file name="${MBEDTLS_DIR}/library/arc4.c" />
<file name="${MBEDTLS_DIR}/library/aria.c" />
<file name="${MBEDTLS_DIR}/library/asn1parse.c" />
<file name="${MBEDTLS_DIR}/library/asn1write.c" />
<file name="${MBEDTLS_DIR}/library/base64.c" />
<file name="${MBEDTLS_DIR}/library/bignum.c" />
<file name="${MBEDTLS_DIR}/library/blowfish.c" />
<file name="${MBEDTLS_DIR}/library/camellia.c" />
<file name="${MBEDTLS_DIR}/library/ccm.c" />
<file name="${MBEDTLS_DIR}/library/chacha20.c" />
<file name="${MBEDTLS_DIR}/library/chachapoly.c" />
<file name="${MBEDTLS_DIR}/library/cipher.c" />
<file name="${MBEDTLS_DIR}/library/cipher_wrap.c" />
<file name="${MBEDTLS_DIR}/library/constant_time.c" />
<file name="${MBEDTLS_DIR}/library/cmac.c" />
<file name="${MBEDTLS_DIR}/library/ctr_drbg.c" />
<file name="${MBEDTLS_DIR}/library/des.c" />
<file name="${MBEDTLS_DIR}/library/dhm.c" />
<file name="${MBEDTLS_DIR}/library/ecdh.c" />
<file name="${MBEDTLS_DIR}/library/ecdsa.c" />
<file name="${MBEDTLS_DIR}/library/ecjpake.c" />
<file name="${MBEDTLS_DIR}/library/ecp.c" />
<file name="${MBEDTLS_DIR}/library/ecp_curves.c" />
<file name="${MBEDTLS_DIR}/library/entropy.c" />
<file name="${MBEDTLS_DIR}/library/entropy_poll.c" />
<file name="${MBEDTLS_DIR}/library/error.c" />
<file name="${MBEDTLS_DIR}/library/gcm.c" />
<file name="${MBEDTLS_DIR}/library/havege.c" />
<file name="${MBEDTLS_DIR}/library/hkdf.c" />
<file name="${MBEDTLS_DIR}/library/hmac_drbg.c" />
<file name="${MBEDTLS_DIR}/library/md.c" />
<file name="${MBEDTLS_DIR}/library/md2.c" />
<file name="${MBEDTLS_DIR}/library/md4.c" />
<file name="${MBEDTLS_DIR}/library/md5.c" />
<file name="${MBEDTLS_DIR}/library/memory_buffer_alloc.c" />
<file name="${MBEDTLS_DIR}/library/mps_reader.c" />
<file name="${MBEDTLS_DIR}/library/mps_trace.c" />
<file name="${MBEDTLS_DIR}/library/nist_kw.c" />
<file name="${MBEDTLS_DIR}/library/oid.c" />
<file name="${MBEDTLS_DIR}/library/padlock.c" />
<file name="${MBEDTLS_DIR}/library/pem.c" />
<file name="${MBEDTLS_DIR}/library/pk.c" />
<file name="${MBEDTLS_DIR}/library/pk_wrap.c" />
<file name="${MBEDTLS_DIR}/library/pkcs12.c" />
<file name="${MBEDTLS_DIR}/library/pkcs5.c" />
<file name="${MBEDTLS_DIR}/library/pkparse.c" />
<file name="${MBEDTLS_DIR}/library/pkwrite.c" />
<file name="${MBEDTLS_DIR}/library/platform.c" />
<file name="${MBEDTLS_DIR}/library/platform_util.c" />
<file name="${MBEDTLS_DIR}/library/poly1305.c" />
<file name="${MBEDTLS_DIR}/library/psa_crypto.c" />
<file name="${MBEDTLS_DIR}/library/psa_crypto_aead.c" />
<file name="${MBEDTLS_DIR}/library/psa_crypto_cipher.c" />
<file name="${MBEDTLS_DIR}/library/psa_crypto_client.c" />
<file name="${MBEDTLS_DIR}/library/psa_crypto_driver_wrappers.c" />
<file name="${MBEDTLS_DIR}/library/psa_crypto_ecp.c" />
<file name="${MBEDTLS_DIR}/library/psa_crypto_hash.c" />
<file name="${MBEDTLS_DIR}/library/psa_crypto_mac.c" />
<file name="${MBEDTLS_DIR}/library/psa_crypto_rsa.c" />
<file name="${MBEDTLS_DIR}/library/psa_crypto_se.c" />
<file name="${MBEDTLS_DIR}/library/psa_crypto_slot_management.c" />
<file name="${MBEDTLS_DIR}/library/psa_crypto_storage.c" />
<file name="${MBEDTLS_DIR}/library/psa_its_file.c" />
<file name="${MBEDTLS_DIR}/library/ripemd160.c" />
<file name="${MBEDTLS_DIR}/library/rsa.c" />
<file name="${MBEDTLS_DIR}/library/rsa_internal.c" />
<file name="${MBEDTLS_DIR}/library/sha1.c" />
<file name="${MBEDTLS_DIR}/library/sha256.c" />
<file name="${MBEDTLS_DIR}/library/sha512.c" />
<file name="${MBEDTLS_DIR}/library/threading.c" />
<file name="${MBEDTLS_DIR}/library/timing.c" />
<file name="${MBEDTLS_DIR}/library/version.c" />
<file name="${MBEDTLS_DIR}/library/version_features.c" />
<file name="${MBEDTLS_DIR}/library/xtea.c" />

<file name="${MBEDTLS_DIR}/library/certs.c" />
<file name="${MBEDTLS_DIR}/library/pkcs11.c" />
<file name="${MBEDTLS_DIR}/library/x509.c" />
<file name="${MBEDTLS_DIR}/library/x509_create.c" />
<file name="${MBEDTLS_DIR}/library/x509_crl.c" />
<file name="${MBEDTLS_DIR}/library/x509_crt.c" />
<file name="${MBEDTLS_DIR}/library/x509_csr.c" />
<file name="${MBEDTLS_DIR}/library/x509write_crt.c" />
<file name="${MBEDTLS_DIR}/library/x509write_csr.c" />

<file name="${MBEDTLS_DIR}/library/debug.c" />
<file name="${MBEDTLS_DIR}/library/net_sockets.c" />
<file name="${MBEDTLS_DIR}/library/ssl_cache.c" />
<file name="${MBEDTLS_DIR}/library/ssl_ciphersuites.c" />
<file name="${MBEDTLS_DIR}/library/ssl_cli.c" />
<file name="${MBEDTLS_DIR}/library/ssl_cookie.c" />
<file name="${MBEDTLS_DIR}/library/ssl_msg.c" />
<file name="${MBEDTLS_DIR}/library/ssl_srv.c" />
<file name="${MBEDTLS_DIR}/library/ssl_ticket.c" />
<file name="${MBEDTLS_DIR}/library/ssl_tls.c" />
<file name="${MBEDTLS_DIR}/library/ssl_tls13_keys.c" />
</files>
<include name="${HXCPP}/project/thirdparty/mbedtls-files.xml" />

<files id="hxcpp_ssl" >
<depend files="hxcpp-depends"/>
<depend name="${this_dir}/Build.xml" dateOnly="true" />
<cache value="true" asLibrary="true" />
<compilerflag value="-I${MBEDTLS_DIR}/include"/>
<compilerflag value="-I${this_dir}"/>
<compilerflag value="-DMBEDTLS_USER_CONFIG_FILE=&lt;mbedtls_config.h&gt;"/>

<include name="${HXCPP}/project/thirdparty/mbedtls-flags.xml" />

<file name="${this_dir}/SSL.cpp"/>
</files>
Expand Down