remove polarssl mbedtls support

Just remove it from cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d2079a..1c5a0bb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,8 +64,6 @@ option(LWS_WITH_SHARED "Build the shared version of the library" ON)
 option(LWS_WITH_SSL "Include SSL support (default OpenSSL, wolfSSL if LWS_USE_WOLFSSL is set)" ON)
 option(LWS_USE_CYASSL "Use CyaSSL replacement for OpenSSL. When setting this, you also need to specify LWS_CYASSL_LIBRARIES and LWS_CYASSL_INCLUDE_DIRS" OFF)
 option(LWS_USE_WOLFSSL "Use wolfSSL replacement for OpenSSL. When setting this, you also need to specify LWS_WOLFSSL_LIBRARIES and LWS_WOLFSSL_INCLUDE_DIRS" OFF)
-option(LWS_USE_POLARSSL "Use Polarssl (or mbedtls < 2.0) replacement for OpenSSL. When setting this, you also need to specify LWS_POLARSSL_LIBRARIES and LWS_POLARSSL_INCLUDE_DIRS" OFF)
-option(LWS_USE_MBEDTLS "Use mbedTLS (>=2.0) replacement for OpenSSL. When setting this, you also need to specify LWS_MBEDTLS_LIBRARIES and LWS_MBEDTLS_INCLUDE_DIRS" OFF)
 option(LWS_WITH_ZLIB "Include zlib support (required for extensions)" ON)
 option(LWS_WITH_LIBEV "Compile with support for libev" OFF)
 option(LWS_WITH_LIBUV "Compile with support for libuv" OFF)
@@ -199,8 +197,6 @@ set(LWS_OPENSSL_LIBRARIES CACHE PATH "Path to the OpenSSL library")
 set(LWS_OPENSSL_INCLUDE_DIRS CACHE PATH "Path to the OpenSSL include directory")
 set(LWS_WOLFSSL_LIBRARIES CACHE PATH "Path to the wolfSSL library")
 set(LWS_WOLFSSL_INCLUDE_DIRS CACHE PATH "Path to the wolfSSL include directory")
-set(LWS_POLARSSL_LIBRARIES CACHE PATH "Path to the PolarSSL library")
-set(LWS_POLARSSL_INCLUDE_DIRS CACHE PATH "Path to the PolarSSL include directory")
 set( CACHE PATH "Path to the libev library")
 set(LWS_LIBEV_INCLUDE_DIRS CACHE PATH "Path to the libev include directory")
 set(LWS_LIBUV_LIBRARIES CACHE PATH "Path to the libuv library")
@@ -213,7 +209,7 @@ if (NOT LWS_WITH_SSL)
        set(LWS_WITHOUT_BUILTIN_SHA1 OFF)
 endif()
 
-if (LWS_WITH_SSL AND NOT LWS_USE_WOLFSSL AND NOT LWS_USE_POLARSSL AND NOT LWS_USE_MBEDTLS)
+if (LWS_WITH_SSL AND NOT LWS_USE_WOLFSSL)
        if ("${LWS_OPENSSL_LIBRARIES}" STREQUAL "" OR "${LWS_OPENSSL_INCLUDE_DIRS}" STREQUAL "")
        else()
                set(OPENSSL_LIBRARIES ${LWS_OPENSSL_LIBRARIES})
@@ -242,19 +238,6 @@ if (LWS_WITH_SSL AND LWS_USE_WOLFSSL)
        endif()
 endif()
 
-if (LWS_WITH_SSL AND LWS_USE_POLARSSL)
-       if ("${LWS_POLARSSL_LIBRARIES}" STREQUAL "" OR "${LWS_POLARSSL_INCLUDE_DIRS}" STREQUAL "")
-               if (NOT POLARSSL_FOUND)
-                       message(FATAL_ERROR "You must set LWS_POLARSSL_LIBRARIES and LWS_POLARSSL_INCLUDE_DIRS when LWS_USE_POLARSSL is turned on.")
-               endif()
-       else()
-               set(POLARSSL_LIBRARIES ${LWS_POLARSSL_LIBRARIES})
-               set(POLARSSL_INCLUDE_DIRS ${LWS_POLARSSL_INCLUDE_DIRS})
-               set(POLARSSL_FOUND 1)
-       endif()
-       set(USE_POLARSSL 1)
-endif()
-
 if (LWS_WITH_SSL AND LWS_USE_MBEDTLS)
        if ("${LWS_MBEDTLS_LIBRARIES}" STREQUAL "" OR "${LWS_MBEDTLS_INCLUDE_DIRS}" STREQUAL "")
                if (NOT MBEDTLS_FOUND)
@@ -825,30 +808,6 @@ if (LWS_WITH_SSL)
                set(chose_ssl 1)
        endif()
 
-       if (LWS_USE_POLARSSL)
-               message("POLARSSL include dir: ${POLARSSL_INCLUDE_DIRS}")
-               message("POLARSSL libraries: ${POLARSSL_LIBRARIES}")
-
-               foreach(inc ${POLARSSL_INCLUDE_DIRS})
-                       include_directories("${inc}" "${inc}/polarssl")
-               endforeach()
-
-               list(APPEND LIB_LIST "${POLARSSL_LIBRARIES}")
-               set(chose_ssl 1)
-       endif()
-       
-       if (LWS_USE_MBEDTLS)
-               message("MBEDTLS include dir: ${MBEDTLS_INCLUDE_DIRS}")
-               message("MBEDTLS libraries: ${MBEDTLS_LIBRARIES}")
-
-               foreach(inc ${MBEDTLS_INCLUDE_DIRS})
-                       include_directories("${inc}" "${inc}/mbedtls")
-               endforeach()
-
-               list(APPEND LIB_LIST "${MBEDTLS_LIBRARIES}")
-               set(chose_ssl 1)
-       endif()
-
        if (NOT chose_ssl)
                if (NOT OPENSSL_FOUND)
                        # TODO: Add support for STATIC also.
@@ -1035,7 +994,7 @@ if (NOT LWS_WITHOUT_TESTAPPS)
                list(APPEND TEST_APP_LIST ${TEST_NAME})
        endmacro()
 
-       if (LWS_WITH_SSL AND NOT LWS_USE_WOLFSSL AND NOT LWS_USE_POLARSSL AND NOT LWS_USE_MBEDTLS)
+       if (LWS_WITH_SSL AND NOT LWS_USE_WOLFSSL)
                message("Searching for OpenSSL executable and dlls")
                find_package(OpenSSLbins)
                message("OpenSSL executable: ${OPENSSL_EXECUTABLE}")
@@ -1584,8 +1543,6 @@ if (LWS_USE_WOLFSSL)
        message("   LWS_WOLFSSL_LIBRARIES = ${LWS_WOLFSSL_LIBRARIES}")
        message("   LWS_WOLFSSL_INCLUDE_DIRS = ${LWS_WOLFSSL_INCLUDE_DIRS}")
 endif()
-message(" LWS_USE_POLARSSL = ${LWS_USE_POLARSSL} (PolarSSL replacement for OpenSSL)")
-message(" LWS_USE_MBEDTLS = ${LWS_USE_MBEDTLS} (mbedtls (nee Polarssl) replacement for OpenSSL)")
 message(" LWS_WITHOUT_BUILTIN_SHA1 = ${LWS_WITHOUT_BUILTIN_SHA1}")
 message(" LWS_WITHOUT_BUILTIN_GETIFADDRS = ${LWS_WITHOUT_BUILTIN_GETIFADDRS}")
 message(" LWS_WITHOUT_CLIENT = ${LWS_WITHOUT_CLIENT}")