Changeset 14440

Timestamp:

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

Author:

mikedld

Message:

#4400: Access CyaSSL RNG in thread-safe manner

File:

• trunk/libtransmission/crypto-utils-cyassl.c (modified) (5 diffs)

trunk/libtransmission/crypto-utils-cyassl.c

@@ -20 +20 @@
 #include "crypto-utils.h"
 #include "log.h"
+#include "platform.h"
 #include "utils.h"
 
@@ -90 +91 @@
 }
 
+static tr_lock *
+get_rng_lock (void)
+{
+  static tr_lock * lock = NULL;
+
+  if (lock == NULL)
+    lock = tr_lockNew ();
+
+  return lock;
+}
+
 /***
 ****
@@ -232 +244 @@
   struct tr_dh_ctx * handle = raw_handle;
   word32 my_private_key_length, my_public_key_length;
+  tr_lock * rng_lock = get_rng_lock ();
 
   assert (handle != NULL);
@@ -238 +251 @@
   if (handle->private_key == NULL)
     handle->private_key = tr_malloc (handle->key_length);
+
+  tr_lockLock (rng_lock);
 
   if (!check_result (DhGenerateKeyPair (&handle->dh, get_rng (),
                                         handle->private_key, &my_private_key_length,
                                         public_key, &my_public_key_length)))
-    return false;
+    {
+      tr_lockUnlock (rng_lock);
+      return false;
+    }
+
+  tr_lockUnlock (rng_lock);
 
   tr_dh_align_key (public_key, my_public_key_length, handle->key_length);
@@ -292 +312 @@
                 size_t   length)
 {
+  bool ret;
+  tr_lock * rng_lock = get_rng_lock ();
+
   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;
+}