3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-02 19:35:29 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3001 from bluca/sodium_global_init

Browse Source 
Problem:  global random init/deinit breaks existing applications
This commit is contained in:
Simon Giesecke 2018-03-19 17:25:33 +01:00 committed by GitHub
commit e49a861f7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/random.cpp
View File

@ -86,6 +86,14 @@ uint32_t zmq::generate_random ()
// order fiasco, this is done using function-local statics, if the // order fiasco, this is done using function-local statics, if the
// compiler implementation supports thread-safe initialization of those. // compiler implementation supports thread-safe initialization of those.
// Otherwise, we fall back to global statics. // Otherwise, we fall back to global statics.
// HOWEVER, this initialisation code imposes ordering constraints, which
// are not obvious to users of libzmq, and may lead to problems if atexit
// or similar methods are used for cleanup.
// In that case, a strict ordering is imposed whereas the contexts MUST
// be initialised BEFORE registering the cleanup with atexit. CZMQ is an
// example. Hence we make the choice to restrict this global transition
// mechanism ONLY to Tweenacl + *NIX (when using /dev/urandom) as it is
// the less risky option.
// TODO if there is some other user of libsodium besides libzmq, this must // TODO if there is some other user of libsodium besides libzmq, this must
// be synchronized by the application. This should probably also be // be synchronized by the application. This should probably also be
@ -105,18 +113,16 @@ uint32_t zmq::generate_random ()
#endif #endif
#if !ZMQ_HAVE_THREADSAFE_STATIC_LOCAL_INIT \ #if !ZMQ_HAVE_THREADSAFE_STATIC_LOCAL_INIT \
&& (defined(ZMQ_USE_LIBSODIUM) \ && (defined(ZMQ_USE_TWEETNACL) && !defined(ZMQ_HAVE_WINDOWS) \
|| (defined(ZMQ_USE_TWEETNACL) && !defined(ZMQ_HAVE_WINDOWS) \ && !defined(ZMQ_HAVE_GETRANDOM))
&& !defined(ZMQ_HAVE_GETRANDOM)))
static unsigned int random_refcount = 0; static unsigned int random_refcount = 0;
static zmq::mutex_t random_sync; static zmq::mutex_t random_sync;
#endif #endif
static void manage_random (bool init) static void manage_random (bool init)
{ {
#if defined(ZMQ_USE_LIBSODIUM) \ #if defined(ZMQ_USE_TWEETNACL) && !defined(ZMQ_HAVE_WINDOWS) \
|| (defined(ZMQ_USE_TWEETNACL) && !defined(ZMQ_HAVE_WINDOWS) \ && !defined(ZMQ_HAVE_GETRANDOM)
&& !defined(ZMQ_HAVE_GETRANDOM))
#if ZMQ_HAVE_THREADSAFE_STATIC_LOCAL_INIT #if ZMQ_HAVE_THREADSAFE_STATIC_LOCAL_INIT
static int random_refcount = 0; static int random_refcount = 0;
@ -140,6 +146,14 @@ static void manage_random (bool init)
randombytes_close (); randombytes_close ();
} }
} }
#elif defined(ZMQ_USE_LIBSODIUM)
if (init) {
int rc = sodium_init ();
zmq_assert (rc != -1);
} else {
randombytes_close ();
}
#endif #endif
} }