lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Move sodium_init() call

Browse source
This commit is contained in:
Eelco Dolstra 2021-01-06 16:43:09 +01:00
parent 3edcb198e5
commit 146af4ee9b
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/libmain/shared.cc
View file

@ -18,6 +18,10 @@
#include <openssl/crypto.h> #include <openssl/crypto.h>
#if HAVE_SODIUM
#include <sodium.h>
#endif
namespace nix { namespace nix {
@ -126,6 +130,11 @@ void initNix()
CRYPTO_set_locking_callback(opensslLockCallback); CRYPTO_set_locking_callback(opensslLockCallback);
#endif #endif
#if HAVE_SODIUM
if (sodium_init() == -1)
throw Error("could not initialise libsodium");
#endif
loadConfFile(); loadConfFile();
startSignalHandlerThread(); startSignalHandlerThread();

3
src/nix-store/nix-store.cc
View file

@ -981,9 +981,6 @@ static void opGenerateBinaryCacheKey(Strings opFlags, Strings opArgs)
string publicKeyFile = *i++; string publicKeyFile = *i++;
#if HAVE_SODIUM #if HAVE_SODIUM
if (sodium_init() == -1)
throw Error("could not initialise libsodium");
unsigned char pk[crypto_sign_PUBLICKEYBYTES]; unsigned char pk[crypto_sign_PUBLICKEYBYTES];
unsigned char sk[crypto_sign_SECRETKEYBYTES]; unsigned char sk[crypto_sign_SECRETKEYBYTES];
if (crypto_sign_keypair(pk, sk) != 0) if (crypto_sign_keypair(pk, sk) != 0)