diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2018-02-08 22:06:09 +0100 |
|---|---|---|
| committer | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2018-02-14 01:26:23 +0100 |
| commit | 34b9fc3022ca2e1b756d2e8a433bd4813531fe98 (patch) | |
| tree | d67d4b33d3e4f1b4170f36289813adfe0443a6f3 /modules/websocket/SCsub | |
| parent | 67b600d957b27c9e084bcb0cc77e80f17a7db621 (diff) | |
lws module now uses mbedtls as OpenSSL replacement
Diffstat (limited to 'modules/websocket/SCsub')
| -rw-r--r-- | modules/websocket/SCsub | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/modules/websocket/SCsub b/modules/websocket/SCsub index 067a99ffff..5138fc1335 100644 --- a/modules/websocket/SCsub +++ b/modules/websocket/SCsub @@ -9,7 +9,6 @@ env_lws = env_modules.Clone() thirdparty_dir = "#thirdparty/lws/" helper_dir = "win32helpers/" -openssl_dir = "#thirdparty/openssl/" thirdparty_sources = [ "client/client.c", "client/client-handshake.c", @@ -42,6 +41,14 @@ thirdparty_sources = [ "service.c", "ssl.c", + "mbedtls_wrapper/library/ssl_cert.c", + "mbedtls_wrapper/library/ssl_pkey.c", + "mbedtls_wrapper/library/ssl_stack.c", + "mbedtls_wrapper/library/ssl_methods.c", + "mbedtls_wrapper/library/ssl_lib.c", + "mbedtls_wrapper/library/ssl_x509.c", + "mbedtls_wrapper/platform/ssl_port.c", + "mbedtls_wrapper/platform/ssl_pm.c", ] if env_lws["platform"] == "android": # Builtin getifaddrs @@ -61,8 +68,11 @@ else: env_lws.add_source_files(env.modules_sources, thirdparty_sources) env_lws.Append(CPPPATH=[thirdparty_dir]) - if env['builtin_openssl']: - env_lws.Append(CPPPATH=[openssl_dir]) + wrapper_includes = ["#thirdparty/lws/mbedtls_wrapper/include/" + inc for inc in ["internal", "openssl", "platform", ""]] + env_lws.Append(CPPPATH=wrapper_includes) + + mbedtls_includes = "#thirdparty/mbedtls/include" + env_lws.Append(CPPPATH=[mbedtls_includes]) if env_lws["platform"] == "windows": env_lws.Append(CPPPATH=[thirdparty_dir + helper_dir]) |