From 49741c59e89f7cb83a7379353cf68f8ad6731140 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Thu, 13 Oct 2016 22:57:01 +0200 Subject: [PATCH] Allows RANDOMBYTES_DEFAULT_IMPLEMENTATION to be overriden --- src/libsodium/randombytes/randombytes.c | 26 +++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/libsodium/randombytes/randombytes.c b/src/libsodium/randombytes/randombytes.c index 781939a0..dd5763a6 100644 --- a/src/libsodium/randombytes/randombytes.c +++ b/src/libsodium/randombytes/randombytes.c @@ -11,10 +11,14 @@ #endif #include "randombytes.h" -#include "randombytes_sysrandom.h" - -#ifdef __native_client__ -# include "randombytes_nativeclient.h" +#ifdef RANDOMBYTES_DEFAULT_IMPLEMENTATION +# include "randombytes_default.h" +#else +# ifdef __native_client__ +# include "randombytes_nativeclient.h" +# else +# include "randombytes_sysrandom.h" +# endif #endif /* C++Builder defines a "random" macro */ @@ -22,13 +26,15 @@ static const randombytes_implementation *implementation; -#ifdef __EMSCRIPTEN__ -# define RANDOMBYTES_DEFAULT_IMPLEMENTATION NULL -#else -# ifdef __native_client__ -# define RANDOMBYTES_DEFAULT_IMPLEMENTATION &randombytes_nativeclient_implementation; +#ifndef RANDOMBYTES_DEFAULT_IMPLEMENTATION +# ifdef __EMSCRIPTEN__ +# define RANDOMBYTES_DEFAULT_IMPLEMENTATION NULL # else -# define RANDOMBYTES_DEFAULT_IMPLEMENTATION &randombytes_sysrandom_implementation; +# ifdef __native_client__ +# define RANDOMBYTES_DEFAULT_IMPLEMENTATION &randombytes_nativeclient_implementation; +# else +# define RANDOMBYTES_DEFAULT_IMPLEMENTATION &randombytes_sysrandom_implementation; +# endif # endif #endif