Skip to content

Commit 6e46254

Browse files
LaszloLangoDaniel Balla
authored and
Daniel Balla
committed
Use TLS module in HTTPS (jerryscript-project#1560)
* Removed the curl dependency * Updated the mbedtls configuration * Removed the code duplications of HTTP and HTTPS modules * Updated the related test files IoT.js-DCO-1.0-Signed-off-by: László Langó [email protected]
1 parent 50729fc commit 6e46254

32 files changed

+979
-1610
lines changed

cmake/mbedtls.cmake

+13-1
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,19 @@ set(DEPS_MBEDTLS_BUILD_DIR ${CMAKE_BINARY_DIR}/${DEPS_MBEDTLS}/library)
2020
set(MODULE_NAME "tls")
2121
set(MODULE_BINARY_DIR ${DEPS_MBEDTLS_BUILD_DIR})
2222

23+
if("${TARGET_OS}" STREQUAL "TIZEN")
24+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-cpp")
25+
endif()
2326
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-sign-conversion")
2427
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${ROOT_DIR}/config/mbedtls")
2528
set(CMAKE_C_FLAGS
2629
"${CMAKE_C_FLAGS} -DMBEDTLS_CONFIG_FILE='<config-for-iotjs.h>'")
2730

28-
#message(FATAL_ERROR "${CMAKE_C_FLAGS}")
31+
# FIXME:
32+
# Remove this workaround when the related bug is fixed in
33+
# mbedtls. https://github.com/ARMmbed/mbedtls/issues/1550
34+
set(CMAKE_C_FLAGS_BCK "${CMAKE_C_FLAGS}")
35+
string(REPLACE "-fsanitize=address" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
2936

3037
ExternalProject_Add(mbedtls
3138
PREFIX ${DEPS_MBEDTLS}
@@ -74,3 +81,8 @@ set_property(DIRECTORY APPEND PROPERTY
7481

7582
set(MBEDTLS_LIBS libmbedtls libmbedx509 libmbedcrypto)
7683
set(MBEDTLS_INCLUDE_DIR ${DEPS_MBEDTLS}/include)
84+
85+
# FIXME:
86+
# Remove this workaround when the related bug is fixed in
87+
# mbedtls. https://github.com/ARMmbed/mbedtls/issues/1550
88+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_BCK}")

0 commit comments

Comments
 (0)