Project homepage Mailing List  Warmcat.com  API Docs  Github Mirror 
{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1749206883, "reponame":"libwebsockets", "desc":"libwebsockets lightweight C networking library", "owner": { "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" },"url":"https://libwebsockets.org/repo/libwebsockets", "f":3, "items": [ {"schema":"libjg2-1", "cid":"998a6b8d8ef09ec276e2d7b4a4520cca", "commit": {"type":"commit", "time": 1468457847, "time_ofs": 480, "oid_tree": { "oid": "9f1d1fec470f82252852fde96eb06863e34b8b74", "alias": []}, "oid":{ "oid": "e8439168dcc93eeb0b2eda341db60a98d758bad2", "alias": []}, "msg": "remove polarssl mbedtls support", "sig_commit": { "git_time": { "time": 1468457847, "offset": 480 }, "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" }, "sig_author": { "git_time": { "time": 1467253283, "offset": 480 }, "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" }}, "body": "remove polarssl mbedtls support\n\nJust remove it from cmake" , "diff": "diff --git a/CMakeLists.txt b/CMakeLists.txt\nindex 9d2079a..1c5a0bb 100644\n--- a/CMakeLists.txt\n+++ b/CMakeLists.txt\n@@ -64,8 +64,6 @@ option(LWS_WITH_SHARED \u0022Build the shared version of the library\u0022 ON)\n option(LWS_WITH_SSL \u0022Include SSL support (default OpenSSL, wolfSSL if LWS_USE_WOLFSSL is set)\u0022 ON)\n option(LWS_USE_CYASSL \u0022Use CyaSSL replacement for OpenSSL. When setting this, you also need to specify LWS_CYASSL_LIBRARIES and LWS_CYASSL_INCLUDE_DIRS\u0022 OFF)\n option(LWS_USE_WOLFSSL \u0022Use wolfSSL replacement for OpenSSL. When setting this, you also need to specify LWS_WOLFSSL_LIBRARIES and LWS_WOLFSSL_INCLUDE_DIRS\u0022 OFF)\n-option(LWS_USE_POLARSSL \u0022Use Polarssl (or mbedtls \u003c 2.0) replacement for OpenSSL. When setting this, you also need to specify LWS_POLARSSL_LIBRARIES and LWS_POLARSSL_INCLUDE_DIRS\u0022 OFF)\n-option(LWS_USE_MBEDTLS \u0022Use mbedTLS (\u003e\u003d2.0) replacement for OpenSSL. When setting this, you also need to specify LWS_MBEDTLS_LIBRARIES and LWS_MBEDTLS_INCLUDE_DIRS\u0022 OFF)\n option(LWS_WITH_ZLIB \u0022Include zlib support (required for extensions)\u0022 ON)\n option(LWS_WITH_LIBEV \u0022Compile with support for libev\u0022 OFF)\n option(LWS_WITH_LIBUV \u0022Compile with support for libuv\u0022 OFF)\n@@ -199,8 +197,6 @@ set(LWS_OPENSSL_LIBRARIES CACHE PATH \u0022Path to the OpenSSL library\u0022)\n set(LWS_OPENSSL_INCLUDE_DIRS CACHE PATH \u0022Path to the OpenSSL include directory\u0022)\n set(LWS_WOLFSSL_LIBRARIES CACHE PATH \u0022Path to the wolfSSL library\u0022)\n set(LWS_WOLFSSL_INCLUDE_DIRS CACHE PATH \u0022Path to the wolfSSL include directory\u0022)\n-set(LWS_POLARSSL_LIBRARIES CACHE PATH \u0022Path to the PolarSSL library\u0022)\n-set(LWS_POLARSSL_INCLUDE_DIRS CACHE PATH \u0022Path to the PolarSSL include directory\u0022)\n set( CACHE PATH \u0022Path to the libev library\u0022)\n set(LWS_LIBEV_INCLUDE_DIRS CACHE PATH \u0022Path to the libev include directory\u0022)\n set(LWS_LIBUV_LIBRARIES CACHE PATH \u0022Path to the libuv library\u0022)\n@@ -213,7 +209,7 @@ if (NOT LWS_WITH_SSL)\n \tset(LWS_WITHOUT_BUILTIN_SHA1 OFF)\n endif()\n \n-if (LWS_WITH_SSL AND NOT LWS_USE_WOLFSSL AND NOT LWS_USE_POLARSSL AND NOT LWS_USE_MBEDTLS)\n+if (LWS_WITH_SSL AND NOT LWS_USE_WOLFSSL)\n \tif (\u0022${LWS_OPENSSL_LIBRARIES}\u0022 STREQUAL \u0022\u0022 OR \u0022${LWS_OPENSSL_INCLUDE_DIRS}\u0022 STREQUAL \u0022\u0022)\n \telse()\n \t\tset(OPENSSL_LIBRARIES ${LWS_OPENSSL_LIBRARIES})\n@@ -242,19 +238,6 @@ if (LWS_WITH_SSL AND LWS_USE_WOLFSSL)\n \tendif()\n endif()\n \n-if (LWS_WITH_SSL AND LWS_USE_POLARSSL)\n-\tif (\u0022${LWS_POLARSSL_LIBRARIES}\u0022 STREQUAL \u0022\u0022 OR \u0022${LWS_POLARSSL_INCLUDE_DIRS}\u0022 STREQUAL \u0022\u0022)\n-\t\tif (NOT POLARSSL_FOUND)\n-\t\t\tmessage(FATAL_ERROR \u0022You must set LWS_POLARSSL_LIBRARIES and LWS_POLARSSL_INCLUDE_DIRS when LWS_USE_POLARSSL is turned on.\u0022)\n-\t\tendif()\n-\telse()\n-\t\tset(POLARSSL_LIBRARIES ${LWS_POLARSSL_LIBRARIES})\n-\t\tset(POLARSSL_INCLUDE_DIRS ${LWS_POLARSSL_INCLUDE_DIRS})\n-\t\tset(POLARSSL_FOUND 1)\n-\tendif()\n-\tset(USE_POLARSSL 1)\n-endif()\n-\n if (LWS_WITH_SSL AND LWS_USE_MBEDTLS)\n \tif (\u0022${LWS_MBEDTLS_LIBRARIES}\u0022 STREQUAL \u0022\u0022 OR \u0022${LWS_MBEDTLS_INCLUDE_DIRS}\u0022 STREQUAL \u0022\u0022)\n \t\tif (NOT MBEDTLS_FOUND)\n@@ -825,30 +808,6 @@ if (LWS_WITH_SSL)\n \t\tset(chose_ssl 1)\n \tendif()\n \n-\tif (LWS_USE_POLARSSL)\n-\t\tmessage(\u0022POLARSSL include dir: ${POLARSSL_INCLUDE_DIRS}\u0022)\n-\t\tmessage(\u0022POLARSSL libraries: ${POLARSSL_LIBRARIES}\u0022)\n-\n-\t\tforeach(inc ${POLARSSL_INCLUDE_DIRS})\n-\t\t\tinclude_directories(\u0022${inc}\u0022 \u0022${inc}/polarssl\u0022)\n-\t\tendforeach()\n-\n-\t\tlist(APPEND LIB_LIST \u0022${POLARSSL_LIBRARIES}\u0022)\n-\t\tset(chose_ssl 1)\n-\tendif()\n-\t\n-\tif (LWS_USE_MBEDTLS)\n-\t\tmessage(\u0022MBEDTLS include dir: ${MBEDTLS_INCLUDE_DIRS}\u0022)\n-\t\tmessage(\u0022MBEDTLS libraries: ${MBEDTLS_LIBRARIES}\u0022)\n-\n-\t\tforeach(inc ${MBEDTLS_INCLUDE_DIRS})\n-\t\t\tinclude_directories(\u0022${inc}\u0022 \u0022${inc}/mbedtls\u0022)\n-\t\tendforeach()\n-\n-\t\tlist(APPEND LIB_LIST \u0022${MBEDTLS_LIBRARIES}\u0022)\n-\t\tset(chose_ssl 1)\n-\tendif()\n-\n \tif (NOT chose_ssl)\n \t\tif (NOT OPENSSL_FOUND)\n \t\t\t# TODO: Add support for STATIC also.\n@@ -1035,7 +994,7 @@ if (NOT LWS_WITHOUT_TESTAPPS)\n \t\tlist(APPEND TEST_APP_LIST ${TEST_NAME})\n \tendmacro()\n \n-\tif (LWS_WITH_SSL AND NOT LWS_USE_WOLFSSL AND NOT LWS_USE_POLARSSL AND NOT LWS_USE_MBEDTLS)\n+\tif (LWS_WITH_SSL AND NOT LWS_USE_WOLFSSL)\n \t\tmessage(\u0022Searching for OpenSSL executable and dlls\u0022)\n \t\tfind_package(OpenSSLbins)\n \t\tmessage(\u0022OpenSSL executable: ${OPENSSL_EXECUTABLE}\u0022)\n@@ -1584,8 +1543,6 @@ if (LWS_USE_WOLFSSL)\n \tmessage(\u0022 LWS_WOLFSSL_LIBRARIES \u003d ${LWS_WOLFSSL_LIBRARIES}\u0022)\n \tmessage(\u0022 LWS_WOLFSSL_INCLUDE_DIRS \u003d ${LWS_WOLFSSL_INCLUDE_DIRS}\u0022)\n endif()\n-message(\u0022 LWS_USE_POLARSSL \u003d ${LWS_USE_POLARSSL} (PolarSSL replacement for OpenSSL)\u0022)\n-message(\u0022 LWS_USE_MBEDTLS \u003d ${LWS_USE_MBEDTLS} (mbedtls (nee Polarssl) replacement for OpenSSL)\u0022)\n message(\u0022 LWS_WITHOUT_BUILTIN_SHA1 \u003d ${LWS_WITHOUT_BUILTIN_SHA1}\u0022)\n message(\u0022 LWS_WITHOUT_BUILTIN_GETIFADDRS \u003d ${LWS_WITHOUT_BUILTIN_GETIFADDRS}\u0022)\n message(\u0022 LWS_WITHOUT_CLIENT \u003d ${LWS_WITHOUT_CLIENT}\u0022)\n","s":{"c":1749206883,"u": 2501}} ],"g": 4257,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}