From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Wed, 15 Jan 2014 23:30:42 +0000 (+0100)
Subject: network: comment libgcrypt initalization process
X-Git-Tag: collectd-5.4.1~1^2^2
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=793c2046de1ac04689d541a5e83513fe8e62578c

network: comment libgcrypt initalization process
---

diff --git a/src/network.c b/src/network.c
index be82c6f5..f379a5c4 100644
--- a/src/network.c
+++ b/src/network.c
@@ -500,8 +500,15 @@ static void network_init_gcrypt (void) /* {{{ */
   if (gcry_control (GCRYCTL_ANY_INITIALIZATION_P))
     return;
 
+ /* http://www.gnupg.org/documentation/manuals/gcrypt/Multi_002dThreading.html
+  * To ensure thread-safety, it's important to set GCRYCTL_SET_THREAD_CBS
+  * *before* initalizing Libgcrypt with gcry_check_version(), which itself must
+  * be called before any other gcry_* function. GCRYCTL_ANY_INITIALIZATION_P
+  * above doesn't count, as it doesn't implicitly initalize Libgcrypt.
+  *
+  * tl;dr: keep all these gry_* statements in this exact order please. */
   gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
-  gcry_check_version (NULL); /* before calling *almost* any other functions */
+  gcry_check_version (NULL);
   gcry_control (GCRYCTL_INIT_SECMEM, 32768);
   gcry_control (GCRYCTL_INITIALIZATION_FINISHED);
 } /* }}} void network_init_gcrypt */