Changeset 14436

Timestamp:

Jan 7, 2015, 2:04:08 AM (6 years ago)

Author:

mikedld

Message:

#4400: Add CyaSSL support

Location:

trunk

Files:

• CMakeLists.txt (modified) (3 diffs)
• cli/Makefile.am (modified) (2 diffs)
• cmake/FindCyaSSL.cmake (added)
• cmake/TrMacros.cmake (modified) (1 diff)
• configure.ac (modified) (3 diffs)
• daemon/Makefile.am (modified) (2 diffs)
• gtk/Makefile.am (modified) (2 diffs)
• libtransmission/CMakeLists.txt (modified) (3 diffs)
• libtransmission/Makefile.am (modified) (2 diffs)
• libtransmission/crypto-utils-cyassl.c (added)
• utils/Makefile.am (modified) (2 diffs)

trunk/CMakeLists.txt

@@ -30 +30 @@
 tr_auto_option(USE_SYSTEM_UTP       "Use system utp library" AUTO)
 tr_auto_option(USE_SYSTEM_B64       "Use system b64 library" AUTO)
+tr_list_option(WITH_CRYPTO          "Use specified crypto library" AUTO openssl cyassl)
 tr_auto_option(WITH_INOTIFY         "Enable inotify support (on systems that support it)" AUTO)
 tr_auto_option(WITH_KQUEUE          "Enable kqueue support (on systems that support it)" AUTO)
@@ -95 +96 @@
 set(EVENT2_MINIMUM          2.0.10)
 set(OPENSSL_MINIMUM         0.9.4)
+set(CYASSL_MINIMUM          3.0)
 set(ZLIB_MINIMUM            1.2.3)
 set(GTK_MINIMUM             3.4.0)
@@ -135 +137 @@
 if(UNIX)
     find_package(ICONV REQUIRED)
+endif()
+
+if(WITH_CRYPTO STREQUAL "AUTO" OR WITH_CRYPTO STREQUAL "openssl")
+    tr_get_required_flag(WITH_CRYPTO OPENSSL_IS_REQUIRED)
+    find_package(OpenSSL ${OPENSSL_MINIMUM} ${OPENSSL_IS_REQUIRED})
+    tr_fixup_list_option(WITH_CRYPTO "openssl" OPENSSL_FOUND "AUTO" OPENSSL_IS_REQUIRED)
+    if(WITH_CRYPTO STREQUAL "openssl")
+        set(CRYPTO_PKG "openssl")
+        set(CRYPTO_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR})
+        set(CRYPTO_LIBRARIES ${OPENSSL_LIBRARIES})
+    endif()
+endif()
+if(WITH_CRYPTO STREQUAL "AUTO" OR WITH_CRYPTO STREQUAL "cyassl")
+    tr_get_required_flag(WITH_CRYPTO CYASSL_IS_REQUIRED)
+    find_package(CyaSSL ${CYASSL_MINIMUM} ${CYASSL_IS_REQUIRED})
+    tr_fixup_list_option(WITH_CRYPTO "cyassl" CYASSL_FOUND "AUTO" CYASSL_IS_REQUIRED)
+    if(WITH_CRYPTO STREQUAL "cyassl")
+        set(CRYPTO_PKG "cyassl")
+        set(CRYPTO_INCLUDE_DIRS ${CYASSL_INCLUDE_DIRS})
+        set(CRYPTO_LIBRARIES ${CYASSL_LIBRARIES})
+    endif()
+endif()
+# We should have found the library by now
+if(CRYPTO_PKG STREQUAL "")
+    if(WITH_CRYPTO STREQUAL "AUTO")
+        message(FATAL_ERROR "Unable to find any supported crypto library.")
+    else()
+        message(FATAL_ERROR "Requested crypto library '${WITH_CRYPTO}' is not supported.")
+    endif()
 endif()
 

trunk/cli/Makefile.am

@@ -3 +3 @@
 AM_CFLAGS = \
     @LIBEVENT_CFLAGS@ \
-    @OPENSSL_CFLAGS@ \
     @LIBCURL_CFLAGS@ \
     @ZLIB_CFLAGS@ \
@@ -23 +22 @@
     @LIBEVENT_LIBS@ \
     @LIBCURL_LIBS@ \
-    @OPENSSL_LIBS@ \
+    @CRYPTO_LIBS@ \
     @INTLLIBS@ \
     @ZLIB_LIBS@ \

trunk/cmake/TrMacros.cmake

@@ -22 +22 @@
     elseif(NOT (${ISREQ}))
         set_property(CACHE ${NAME} PROPERTY VALUE OFF)
+    endif()
+endmacro()
+
+function(tr_list_option_changed NAME ACC VAL FIL STK)
+    get_property(VAR_STRINGS CACHE ${NAME} PROPERTY STRINGS)
+    string(TOUPPER "${VAL}" VAL_UPCASE)
+    foreach(X ${VAR_STRINGS})
+        string(TOUPPER "${X}" X_UPCASE)
+        if("${VAL_UPCASE}" STREQUAL "${X_UPCASE}")
+            if(NOT "${VAL}" STREQUAL "${X}")
+                set_property(CACHE ${NAME} PROPERTY VALUE "${X}")
+                message(STATUS ">>> (list) ${NAME} -> ${X}")
+            endif()
+            return()
+        endif()
+    endforeach()
+    string(REPLACE ";" "', '" VAR_STRINGS "${VAR_STRINGS}")
+    message(FATAL_ERROR "Option '${NAME}' set to unrecognized value '${VAL}'. Should be one of '${VAR_STRINGS}'.")
+endfunction()
+
+macro(tr_list_option NAME DESC VAL)
+    set(${NAME} "${VAL}" CACHE STRING "${DESC}")
+    set_property(CACHE ${NAME} PROPERTY STRINGS "${VAL};${ARGN}")
+    variable_watch(${NAME} tr_list_option_changed)
+endmacro()
+
+macro(tr_fixup_list_option NAME FVAL ISFOUND RVAL ISREQ)
+    if(${ISFOUND})
+        set_property(CACHE ${NAME} PROPERTY VALUE "${FVAL}")
+    elseif(NOT (${ISREQ}))
+        set_property(CACHE ${NAME} PROPERTY VALUE "${RVAL}")
     endif()
 endmacro()

trunk/configure.ac

@@ -38 +38 @@
 ##
 ##
+
 CURL_MINIMUM=7.15.4
 AC_SUBST(CURL_MINIMUM)
 LIBEVENT_MINIMUM=2.0.10
 AC_SUBST(LIBEVENT_MINIMUM)
+ZLIB_MINIMUM=1.2.3
+AC_SUBST(ZLIB_MINIMUM)
+
+# crypto backends
 OPENSSL_MINIMUM=0.9.4
 AC_SUBST(OPENSSL_MINIMUM)
-ZLIB_MINIMUM=1.2.3
-AC_SUBST(ZLIB_MINIMUM)
+CYASSL_MINIMUM=3.0
+AC_SUBST(CYASSL_MINIMUM)
 
 ##
@@ -113 +118 @@
 AC_SEARCH_LIBS([gethostbyname], [nsl bind])
 AC_SEARCH_LIBS([quotacursor_skipidtype], [quota])
-PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MINIMUM], , [CHECK_SSL()])
 PKG_CHECK_MODULES(LIBCURL, [libcurl >= $CURL_MINIMUM])
 PKG_CHECK_MODULES(LIBEVENT, [libevent >= $LIBEVENT_MINIMUM])
 PKG_CHECK_MODULES(ZLIB, [zlib >= $ZLIB_MINIMUM])
+
+
+AC_ARG_WITH([crypto], AS_HELP_STRING([--with-crypto=PKG],
+            [Use specified crypto library: auto (default), openssl, cyassl]),
+            [want_crypto=$withval], [want_crypto=auto])
+
+AS_IF([test "x$want_crypto" = "xauto" -o "x$want_crypto" = "xopenssl"], [
+    PKG_CHECK_MODULES(OPENSSL, [openssl >= $OPENSSL_MINIMUM],
+        [want_crypto="openssl"; CRYPTO_PKG="openssl"; CRYPTO_CFLAGS="$OPENSSL_CFLAGS"; CRYPTO_LIBS="$OPENSSL_LIBS"],
+        [AS_IF([test "x$want_crypto" = "xopenssl"],
+            [AC_MSG_ERROR([OpenSSL support requested, but library not found.])]
+        )]
+    )
+])
+AS_IF([test "x$want_crypto" = "xauto" -o "x$want_crypto" = "xcyassl"], [
+    PKG_CHECK_MODULES(CYASSL, [cyassl >= $CYASSL_MINIMUM],
+        [want_crypto="cyassl"; CRYPTO_PKG="cyassl"; CRYPTO_CFLAGS="$CYASSL_CFLAGS"; CRYPTO_LIBS="$CYASSL_LIBS"],
+        [AS_IF([test "x$want_crypto" = "xcyassl"],
+            [AC_MSG_ERROR([CyaSSL support requested, but library not found.])]
+        )]
+    )
+])
+# we should have found the library by now
+AS_IF([test "x$CRYPTO_PKG" = "x"], [
+    AS_IF([test "x$want_crypto" = "xauto"],
+        [AC_MSG_ERROR([Unable to find any supported crypto library.])],
+        [AC_MSG_ERROR([Requested crypto library "$want_crypto" is not supported.])],
+    )
+])
+
+AC_SUBST(CRYPTO_PKG)
+AC_SUBST(CRYPTO_CFLAGS)
+AC_SUBST(CRYPTO_LIBS)
+
 
 AC_SYS_LARGEFILE
@@ -620 +658 @@
       * optimized for low-resource systems:           ${enable_lightweight}
       * µTP enabled:                                  ${build_utp}
+      * crypto library:                               ${CRYPTO_PKG}
 
    Build Command-Line client:                         ${build_cli}

trunk/daemon/Makefile.am

@@ -3 +3 @@
 AM_CFLAGS = \
     @LIBEVENT_CFLAGS@ \
-    @OPENSSL_CFLAGS@ \
     @LIBCURL_CFLAGS@ \
     @SYSTEMD_DAEMON_CFLAGS@ \
@@ -29 +28 @@
     @LIBEVENT_LIBS@ \
     @LIBCURL_LIBS@ \
-    @OPENSSL_LIBS@ \
+    @CRYPTO_LIBS@ \
     @INTLLIBS@ \
     @SYSTEMD_DAEMON_LIBS@ \

trunk/gtk/Makefile.am

@@ -22 +22 @@
     @GTK_CFLAGS@ \
     @LIBCURL_CFLAGS@ \
-    @OPENSSL_CFLAGS@ \
     @ZLIB_CFLAGS@ \
     @PTHREAD_CFLAGS@
@@ -96 +95 @@
     @LIBEVENT_LIBS@ \
     @LIBCURL_LIBS@ \
-    @OPENSSL_LIBS@ \
+    @CRYPTO_LIBS@ \
     @ZLIB_LIBS@ \
     @PTHREAD_LIBS@ \

trunk/libtransmission/CMakeLists.txt

@@ -17 +17 @@
     crypto-utils.c
     crypto-utils-fallback.c
-    crypto-utils-openssl.c
+    crypto-utils-${CRYPTO_PKG}.c
     error.c
     fdlimit.c
@@ -168 +168 @@
     ${PROJECT_BINARY_DIR}
     ${ZLIB_INCLUDE_DIRS}
-    ${OPENSSL_INCLUDE_DIRS}
+    ${CRYPTO_INCLUDE_DIRS}
     ${CURL_INCLUDE_DIRS}
     ${ICONV_INCLUDE_DIRS}
@@ -201 +201 @@
     ${CMAKE_THREAD_LIBS_INIT}
     ${ZLIB_LIBRARIES}
-    ${OPENSSL_LIBRARIES}
+    ${CRYPTO_LIBRARIES}
     ${CURL_LIBRARIES}
     ${ICONV_LIBRARIES}

trunk/libtransmission/Makefile.am

@@ -12 +12 @@
   @LIBEVENT_CFLAGS@ \
   @LIBCURL_CFLAGS@ \
-  @OPENSSL_CFLAGS@ \
+  @CRYPTO_CFLAGS@ \
   @PTHREAD_CFLAGS@ \
   @ZLIB_CFLAGS@
@@ -179 +179 @@
   @LIBCURL_LIBS@ \
   @LIBEVENT_LIBS@ \
-  @OPENSSL_LIBS@ \
+  @CRYPTO_LIBS@ \
   @PTHREAD_LIBS@ \
   @ZLIB_LIBS@ \

trunk/utils/Makefile.am

@@ -4 +4 @@
     @LIBEVENT_CFLAGS@ \
     @LIBCURL_CFLAGS@ \
-    @OPENSSL_CFLAGS@ \
     @ZLIB_CFLAGS@ \
     @PTHREAD_CFLAGS@ \
@@ -36 +35 @@
     @LIBEVENT_LIBS@ \
     @LIBCURL_LIBS@ \
-    @OPENSSL_LIBS@ \
+    @CRYPTO_LIBS@ \
     @ZLIB_LIBS@ \
     @PTHREAD_LIBS@ \