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

Move sodium_init() to initLibStore()

Browse source 
Part of an effort to make it easier to initialize the right things,
by moving code into the appropriate libraries.
This commit is contained in:
Robert Hensing 2023-02-01 17:12:11 +01:00
parent 9693076715
commit a58be39476
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libmain/shared.cc
View file

@ -28,8 +28,6 @@
#include <openssl/crypto.h> #include <openssl/crypto.h>
#include <sodium.h>
namespace nix { namespace nix {
@ -164,9 +162,6 @@ void initNix()
initLibUtil(); initLibUtil();
initLibStore(); initLibStore();
if (sodium_init() == -1)
throw Error("could not initialise libsodium");
startSignalHandlerThread(); startSignalHandlerThread();
/* Reset SIGCHLD to its default. */ /* Reset SIGCHLD to its default. */

5
src/libstore/globals.cc
View file

@ -13,6 +13,8 @@
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include <sodium/core.h>
namespace nix { namespace nix {
@ -292,6 +294,9 @@ void assertLibStoreInitialized() {
void initLibStore() { void initLibStore() {
if (sodium_init() == -1)
throw Error("could not initialise libsodium");
loadConfFile(); loadConfFile();
initLibStoreDone = true; initLibStoreDone = true;