mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-23 00:04:06 +00:00
Code Issues Releases Wiki Activity

Lower minimum PolarSSL version required down to 1.2

Browse source
This commit is contained in:
Mike Gelfand 2015-01-07 13:41:22 +00:00
parent c3afe215d5
commit 30690fcf99
3 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -96,7 +96,7 @@ set(CURL_MINIMUM 7.15.4)
set(EVENT2_MINIMUM 2.0.10)
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)
set(GLIB_MINIMUM 2.32.0)

2
configure.ac
View file

@ -50,7 +50,7 @@ OPENSSL_MINIMUM=0.9.4
AC_SUBST(OPENSSL_MINIMUM)
CYASSL_MINIMUM=3.0
AC_SUBST(CYASSL_MINIMUM)
POLARSSL_MINIMUM=0x01030000 # 1.3
POLARSSL_MINIMUM=0x01020000 # 1.2
AC_SUBST(POLARSSL_MINIMUM)
##

26
libtransmission/crypto-utils-polarssl.c
View file

@ -15,6 +15,7 @@
#include <polarssl/dhm.h>
#include <polarssl/error.h>
#include <polarssl/sha1.h>
#include <polarssl/version.h>
#include "transmission.h"
#include "crypto-utils.h"
@ -110,7 +111,12 @@ get_rng_lock (void)
tr_sha1_ctx_t
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;
}
@ -142,6 +148,10 @@ tr_sha1_final (tr_sha1_ctx_t handle,
sha1_finish (handle, hash);
}
#if POLARSSL_VERSION_NUMBER >= 0x01030800
sha1_free (handle);
#endif
tr_free (handle);
return true;
}
@ -153,12 +163,22 @@ tr_sha1_final (tr_sha1_ctx_t handle,
tr_rc4_ctx_t
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;
}
void
tr_rc4_free (tr_rc4_ctx_t handle)
{
#if POLARSSL_VERSION_NUMBER >= 0x01030800
arc4_free (handle);
#endif
tr_free (handle);
}
@ -205,7 +225,9 @@ tr_dh_new (const uint8_t * prime_num,
assert (prime_num != NULL);
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)) ||
!check_result (mpi_read_binary (&handle->G, generator_num, generator_num_length)))