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

#4400: Access CyaSSL RNG in thread-safe manner

Browse source
This commit is contained in:
Mike Gelfand 2015-01-07 13:13:19 +00:00
parent 097b1dc50f
commit 035589f8af
1 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
libtransmission/crypto-utils-cyassl.c
View file

@ -19,6 +19,7 @@
#include "transmission.h" #include "transmission.h"
#include "crypto-utils.h" #include "crypto-utils.h"
#include "log.h" #include "log.h"
#include "platform.h"
#include "utils.h" #include "utils.h"
#define TR_CRYPTO_DH_SECRET_FALLBACK #define TR_CRYPTO_DH_SECRET_FALLBACK
@ -89,6 +90,17 @@ get_rng (void)
return &rng; return &rng;
} }
static tr_lock *
get_rng_lock (void)
{
static tr_lock * lock = NULL;
if (lock == NULL)
lock = tr_lockNew ();
return lock;
}
/*** /***
**** ****
***/ ***/
@ -231,6 +243,7 @@ tr_dh_make_key (tr_dh_ctx_t raw_handle,
{ {
struct tr_dh_ctx * handle = raw_handle; struct tr_dh_ctx * handle = raw_handle;
word32 my_private_key_length, my_public_key_length; word32 my_private_key_length, my_public_key_length;
tr_lock * rng_lock = get_rng_lock ();
assert (handle != NULL); assert (handle != NULL);
assert (public_key != NULL); assert (public_key != NULL);
@ -238,10 +251,17 @@ tr_dh_make_key (tr_dh_ctx_t raw_handle,
if (handle->private_key == NULL) if (handle->private_key == NULL)
handle->private_key = tr_malloc (handle->key_length); handle->private_key = tr_malloc (handle->key_length);
tr_lockLock (rng_lock);
if (!check_result (DhGenerateKeyPair (&handle->dh, get_rng (), if (!check_result (DhGenerateKeyPair (&handle->dh, get_rng (),
handle->private_key, &my_private_key_length, handle->private_key, &my_private_key_length,
public_key, &my_public_key_length))) public_key, &my_public_key_length)))
{
tr_lockUnlock (rng_lock);
return false; return false;
}
tr_lockUnlock (rng_lock);
tr_dh_align_key (public_key, my_public_key_length, handle->key_length); tr_dh_align_key (public_key, my_public_key_length, handle->key_length);
@ -291,7 +311,14 @@ bool
tr_rand_buffer (void * buffer, tr_rand_buffer (void * buffer,
size_t length) size_t length)
{ {
bool ret;
tr_lock * rng_lock = get_rng_lock ();
assert (buffer != NULL); assert (buffer != NULL);
return check_result (RNG_GenerateBlock (get_rng (), buffer, length)); tr_lockLock (rng_lock);
ret = check_result (RNG_GenerateBlock (get_rng (), buffer, length));
tr_lockUnlock (rng_lock);
return ret;
} }