mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #24 from sebastianas/openssl_1.1 

transmission: build against openssl 1.1.0
This commit is contained in:
Mike Gelfand 2016-09-07 01:10:16 +03:00
parent 959517da0d 8c8386a7f3
commit eb8f5004e0
1 changed files with 75 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
libtransmission/crypto-utils-openssl.c
View File

@ -14,6 +14,7 @@
#include <assert.h>
#include <openssl/bn.h>
#include <openssl/crypto.h>
#include <openssl/dh.h>
#include <openssl/err.h>
#include <openssl/evp.h>
@ -48,7 +49,12 @@ log_openssl_error (const char * file,
static bool strings_loaded = false;
if (!strings_loaded)
{
#if OPENSSL_VERSION_NUMBER < 0x10100000
ERR_load_crypto_strings ();
#else
OPENSSL_init_crypto (OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
#endif
strings_loaded = true;
}
#endif
@ -229,6 +235,63 @@ tr_rc4_process (tr_rc4_ctx_t handle,
****
***/
#if OPENSSL_VERSION_NUMBER < 0x10100000
static inline int
DH_set0_pqg (DH * dh,
BIGNUM * p,
BIGNUM * q,
BIGNUM * g)
{
/* If the fields p and g in d are NULL, the corresponding input
* parameters MUST be non-NULL. q may remain NULL.
*/
if ((dh->p == NULL && p == NULL) || (dh->g == NULL && g == NULL))
return 0;
if (p != NULL)
{
BN_free (dh->p);
dh->p = p;
}
if (q != NULL)
{
BN_free (dh->q);
dh->q = q;
}
if (g != NULL)
{
BN_free (dh->g);
dh->g = g;
}
if (q != NULL)
dh->length = BN_num_bits (q);
return 1;
}
static inline int
DH_set_length (DH * dh,
long length)
{
dh->length = length;
return 1;
}
static inline void
DH_get0_key(const DH * dh,
const BIGNUM ** pub_key,
const BIGNUM ** priv_key)
{
if (pub_key != NULL)
*pub_key = dh->pub_key;
if (priv_key != NULL)
*priv_key = dh->priv_key;
}
#endif
tr_dh_ctx_t
tr_dh_new (const uint8_t * prime_num,
size_t prime_num_length,
@ -236,13 +299,18 @@ tr_dh_new (const uint8_t * prime_num,
size_t generator_num_length)
{
DH * handle = DH_new ();
BIGNUM * p, * g;
assert (prime_num != NULL);
assert (generator_num != NULL);
if (!check_pointer (handle->p = BN_bin2bn (prime_num, prime_num_length, NULL)) ||
!check_pointer (handle->g = BN_bin2bn (generator_num, generator_num_length, NULL)))
p = BN_bin2bn (prime_num, prime_num_length, NULL);
g = BN_bin2bn (generator_num, generator_num_length, NULL);
if (!check_pointer (p) || !check_pointer (g) || !DH_set0_pqg (handle, p, NULL, g))
{
BN_free (p);
BN_free (g);
DH_free (handle);
handle = NULL;
}
@ -267,16 +335,19 @@ tr_dh_make_key (tr_dh_ctx_t raw_handle,
{
DH * handle = raw_handle;
int dh_size, my_public_key_length;
const BIGNUM * my_public_key;
assert (handle != NULL);
assert (public_key != NULL);
handle->length = private_key_length * 8;
DH_set_length(handle, private_key_length * 8);
if (!check_result (DH_generate_key (handle)))
return false;
my_public_key_length = BN_bn2bin (handle->pub_key, public_key);
DH_get0_key (handle, &my_public_key, NULL);
my_public_key_length = BN_bn2bin (my_public_key, public_key);
dh_size = DH_size (handle);
tr_dh_align_key (public_key, my_public_key_length, dh_size);