Changeset 14441

Timestamp:

Jan 7, 2015, 1:19:00 PM (7 years ago)

Author:

mikedld

Message:

Add PolarSSL support

Location:

trunk

Files:

• CMakeLists.txt (modified) (3 diffs)
• cmake/FindPolarSSL.cmake (added)
• configure.ac (modified) (3 diffs)
• libtransmission/crypto-utils-polarssl.c (added)

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_list_option(WITH_CRYPTO          "Use specified crypto library" AUTO openssl cyassl polarssl)
 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)
@@ -97 +97 @@
 set(OPENSSL_MINIMUM         0.9.4)
 set(CYASSL_MINIMUM          3.0)
+set(POLARSSL_MINIMUM        1.3)
 set(ZLIB_MINIMUM            1.2.3)
 set(GTK_MINIMUM             3.4.0)
@@ -156 +157 @@
         set(CRYPTO_INCLUDE_DIRS ${CYASSL_INCLUDE_DIRS})
         set(CRYPTO_LIBRARIES ${CYASSL_LIBRARIES})
+    endif()
+endif()
+if(WITH_CRYPTO STREQUAL "AUTO" OR WITH_CRYPTO STREQUAL "polarssl")
+    tr_get_required_flag(WITH_CRYPTO POLARSSL_IS_REQUIRED)
+    find_package(PolarSSL ${POLARSSL_MINIMUM} ${POLARSSL_IS_REQUIRED})
+    tr_fixup_list_option(WITH_CRYPTO "polarssl" POLARSSL_FOUND "AUTO" POLARSSL_IS_REQUIRED)
+    if(WITH_CRYPTO STREQUAL "polarssl")
+        set(CRYPTO_PKG "polarssl")
+        set(CRYPTO_INCLUDE_DIRS ${POLARSSL_INCLUDE_DIRS})
+        set(CRYPTO_LIBRARIES ${POLARSSL_LIBRARIES})
     endif()
 endif()

trunk/configure.ac

@@ -51 +51 @@
 CYASSL_MINIMUM=3.0
 AC_SUBST(CYASSL_MINIMUM)
+POLARSSL_MINIMUM=0x01030000 # 1.3
+AC_SUBST(POLARSSL_MINIMUM)
 
 ##
@@ -124 +126 @@
 
 AC_ARG_WITH([crypto], AS_HELP_STRING([--with-crypto=PKG],
-            [Use specified crypto library: auto (default), openssl, cyassl]),
+            [Use specified crypto library: auto (default), openssl, cyassl, polarssl]),
             [want_crypto=$withval], [want_crypto=auto])
 
@@ -140 +142 @@
         [AS_IF([test "x$want_crypto" = "xcyassl"],
             [AC_MSG_ERROR([CyaSSL support requested, but library not found.])]
+        )]
+    )
+])
+AS_IF([test "x$want_crypto" = "xauto" -o "x$want_crypto" = "xpolarssl"], [
+    AC_CHECK_HEADER([polarssl/version.h],
+        [AC_EGREP_CPP([version_ok], [#include <polarssl/version.h>
+                                     #if defined (POLARSSL_VERSION_NUMBER) && POLARSSL_VERSION_NUMBER >= $POLARSSL_MINIMUM
+                                     version_ok
+                                     #endif],
+            [AC_CHECK_LIB([polarssl], [dhm_init],
+                [want_crypto="polarssl"; CRYPTO_PKG="polarssl"; CRYPTO_CFLAGS=""; CRYPTO_LIBS="-lpolarssl"],
+                [AS_IF([test "x$want_crypto" = "xpolarssl"],
+                    [AC_MSG_ERROR([PolarSSL support requested, but library not found.])]
+                )]
+            )],
+            [AS_IF([test "x$want_crypto" = "xpolarssl"],
+                [AC_MSG_ERROR([PolarSSL support requested, but version not suitable.])]
+            )]
+        )],
+        [AS_IF([test "x$want_crypto" = "xpolarssl"],
+            [AC_MSG_ERROR([PolarSSL support requested, but headers not found.])]
         )]
     )