aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 07:04:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

hsmtool: move sodium_init() to top level.

Browse Source 
This way we always call it (we weren't for some paths!).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2023-04-07 21:25:14 +09:30
committed by ShahanaFarooqui
parent e5c76f829e
commit 441b38c9ea
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/hsmtool.c
View File

@@ -206,10 +206,6 @@ static int decrypt_hsm(const char *hsm_secret_path)
if (!passwd)
errx(exit_code, "%s", err);
if (sodium_init() == -1)
errx(ERROR_LIBSODIUM,
"Could not initialize libsodium. Not enough entropy ?");
dir = path_dirname(NULL, hsm_secret_path);
backup = path_join(dir, dir, "hsm_secret.backup");
@@ -276,10 +272,6 @@ static int encrypt_hsm(const char *hsm_secret_path)
dir = path_dirname(NULL, hsm_secret_path);
backup = path_join(dir, dir, "hsm_secret.backup");
if (sodium_init() == -1)
errx(ERROR_LIBSODIUM,
"Could not initialize libsodium. Not enough entropy ?");
/* Derive the encryption key from the password provided, and try to encrypt
* the seed. */
exit_code = hsm_secret_encryption_key_with_exitcode(passwd, &key, &err);
@@ -630,6 +622,10 @@ int main(int argc, char *argv[])
if (!method)
show_usage(argv[0]);
if (sodium_init() == -1)
errx(ERROR_LIBSODIUM,
"Could not initialize libsodium. Not enough entropy ?");
if (streq(method, "decrypt")) {
if (argc < 3)
show_usage(argv[0]);