Changeset 14443

Timestamp:

Jan 7, 2015, 1:41:22 PM (7 years ago)

Author:

mikedld

Message:

Lower minimum PolarSSL version required down to 1.2

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• configure.ac (modified) (1 diff)
• libtransmission/crypto-utils-polarssl.c (modified) (6 diffs)

trunk/CMakeLists.txt

@@ -97 +97 @@
 set(OPENSSL_MINIMUM         0.9.4)
 set(CYASSL_MINIMUM          3.0)
-set(POLARSSL_MINIMUM        1.3)
+set(POLARSSL_MINIMUM        1.2)
 set(ZLIB_MINIMUM            1.2.3)
 set(GTK_MINIMUM             3.4.0)

trunk/configure.ac

@@ -51 +51 @@
 CYASSL_MINIMUM=3.0
 AC_SUBST(CYASSL_MINIMUM)
-POLARSSL_MINIMUM=0x01030000 # 1.3
+POLARSSL_MINIMUM=0x01020000 # 1.2
 AC_SUBST(POLARSSL_MINIMUM)
 

trunk/libtransmission/crypto-utils-polarssl.c

@@ -16 +16 @@
 #include <polarssl/error.h>
 #include <polarssl/sha1.h>
+#include <polarssl/version.h>
 
 #include "transmission.h"
@@ -111 +112 @@
 tr_sha1_init (void)
 {
-  sha1_context * handle = tr_new (sha1_context, 1);
+  sha1_context * handle = tr_new0 (sha1_context, 1);
+
+#if POLARSSL_VERSION_NUMBER >= 0x01030800
+  sha1_init (handle);
+#endif
+
   sha1_starts (handle);
   return handle;
@@ -143 +149 @@
     }
 
+#if POLARSSL_VERSION_NUMBER >= 0x01030800
+  sha1_free (handle);
+#endif
+
   tr_free (handle);
   return true;
@@ -154 +164 @@
 tr_rc4_new (void)
 {
-  return tr_new0 (arc4_context, 1);
+  arc4_context * handle = tr_new0 (arc4_context, 1);
+
+#if POLARSSL_VERSION_NUMBER >= 0x01030800
+  arc4_init (handle);
+#endif
+
+  return handle;
 }
 
@@ -160 +176 @@
 tr_rc4_free (tr_rc4_ctx_t handle)
 {
+#if POLARSSL_VERSION_NUMBER >= 0x01030800
+  arc4_free (handle);
+#endif
+
   tr_free (handle);
 }
@@ -206 +226 @@
   assert (generator_num != NULL);
 
+#if POLARSSL_VERSION_NUMBER >= 0x01030800
   dhm_init (handle);
+#endif
 
   if (!check_result (mpi_read_binary (&handle->P, prime_num, prime_num_length)) ||