mirror of
https://github.com/ElementsProject/lightning.git
synced 2024-11-19 09:54:16 +01:00
7401b26824
Before: Ten builds, laptop -j5, no ccache: ``` real 0m36.686000-38.956000(38.608+/-0.65)s user 2m32.864000-42.253000(40.7545+/-2.7)s sys 0m16.618000-18.316000(17.8531+/-0.48)s ``` Ten builds, laptop -j5, ccache (warm): ``` real 0m8.212000-8.577000(8.39989+/-0.13)s user 0m12.731000-13.212000(12.9751+/-0.17)s sys 0m3.697000-3.902000(3.83722+/-0.064)s ``` After: Ten builds, laptop -j5, no ccache: 8% faster ``` real 0m33.802000-35.773000(35.468+/-0.54)s user 2m19.073000-27.754000(26.2542+/-2.3)s sys 0m15.784000-17.173000(16.7165+/-0.37)s ``` Ten builds, laptop -j5, ccache (warm): 1% faster ``` real 0m8.200000-8.485000(8.30138+/-0.097)s user 0m12.485000-13.100000(12.7344+/-0.19)s sys 0m3.702000-3.889000(3.78787+/-0.056)s ``` Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
129 lines
3.7 KiB
C
129 lines
3.7 KiB
C
#include <common/hsm_encryption.h>
|
|
#include <termios.h>
|
|
#include <unistd.h>
|
|
|
|
char *hsm_secret_encryption_key(const char *pass, struct secret *key)
|
|
{
|
|
u8 salt[16] = "c-lightning\0\0\0\0\0";
|
|
|
|
/* Don't swap the encryption key ! */
|
|
if (sodium_mlock(key->data, sizeof(key->data)) != 0)
|
|
return "Could not lock hsm_secret encryption key memory.";
|
|
|
|
/* Check bounds. */
|
|
if (strlen(pass) < crypto_pwhash_argon2id_PASSWD_MIN)
|
|
return "Password too short to be able to derive a key from it.";
|
|
if (strlen(pass) > crypto_pwhash_argon2id_PASSWD_MAX)
|
|
return "Password too long to be able to derive a key from it.";
|
|
|
|
/* Now derive the key. */
|
|
if (crypto_pwhash(key->data, sizeof(key->data), pass, strlen(pass), salt,
|
|
/* INTERACTIVE needs 64 MiB of RAM, MODERATE needs 256,
|
|
* and SENSITIVE needs 1024. */
|
|
crypto_pwhash_argon2id_OPSLIMIT_MODERATE,
|
|
crypto_pwhash_argon2id_MEMLIMIT_MODERATE,
|
|
crypto_pwhash_ALG_ARGON2ID13) != 0)
|
|
return "Could not derive a key from the password.";
|
|
|
|
return NULL;
|
|
}
|
|
|
|
bool encrypt_hsm_secret(const struct secret *encryption_key,
|
|
const struct secret *hsm_secret,
|
|
struct encrypted_hsm_secret *output)
|
|
{
|
|
crypto_secretstream_xchacha20poly1305_state crypto_state;
|
|
|
|
if (crypto_secretstream_xchacha20poly1305_init_push(&crypto_state, output->data,
|
|
encryption_key->data) != 0)
|
|
return false;
|
|
if (crypto_secretstream_xchacha20poly1305_push(&crypto_state,
|
|
output->data + HS_HEADER_LEN,
|
|
NULL, hsm_secret->data,
|
|
sizeof(hsm_secret->data),
|
|
/* Additional data and tag */
|
|
NULL, 0, 0))
|
|
return false;
|
|
|
|
return true;
|
|
}
|
|
|
|
bool decrypt_hsm_secret(const struct secret *encryption_key,
|
|
const struct encrypted_hsm_secret *cipher,
|
|
struct secret *output)
|
|
{
|
|
crypto_secretstream_xchacha20poly1305_state crypto_state;
|
|
|
|
/* The header part */
|
|
if (crypto_secretstream_xchacha20poly1305_init_pull(&crypto_state, cipher->data,
|
|
encryption_key->data) != 0)
|
|
return false;
|
|
/* The ciphertext part */
|
|
if (crypto_secretstream_xchacha20poly1305_pull(&crypto_state, output->data,
|
|
NULL, 0,
|
|
cipher->data + HS_HEADER_LEN,
|
|
HS_CIPHERTEXT_LEN,
|
|
NULL, 0) != 0)
|
|
return false;
|
|
|
|
return true;
|
|
}
|
|
|
|
void discard_key(struct secret *key TAKES)
|
|
{
|
|
/* sodium_munlock() also zeroes the memory. */
|
|
sodium_munlock(key->data, sizeof(key->data));
|
|
if (taken(key))
|
|
tal_free(key);
|
|
}
|
|
|
|
/* Read a line from stdin, do not take the newline character into account. */
|
|
static bool getline_stdin_pass(char **passwd, size_t *passwd_size)
|
|
{
|
|
if (getline(passwd, passwd_size, stdin) < 0)
|
|
return false;
|
|
|
|
if ((*passwd)[strlen(*passwd) - 1] == '\n')
|
|
(*passwd)[strlen(*passwd) - 1] = '\0';
|
|
|
|
return true;
|
|
}
|
|
|
|
char *read_stdin_pass(char **reason)
|
|
{
|
|
struct termios current_term, temp_term;
|
|
char *passwd = NULL;
|
|
size_t passwd_size = 0;
|
|
|
|
if (isatty(fileno(stdin))) {
|
|
/* Set a temporary term, same as current but with ECHO disabled. */
|
|
if (tcgetattr(fileno(stdin), ¤t_term) != 0) {
|
|
*reason = "Could not get current terminal options.";
|
|
return NULL;
|
|
}
|
|
temp_term = current_term;
|
|
temp_term.c_lflag &= ~ECHO;
|
|
if (tcsetattr(fileno(stdin), TCSAFLUSH, &temp_term) != 0) {
|
|
*reason = "Could not disable pass echoing.";
|
|
return NULL;
|
|
}
|
|
|
|
if (!getline_stdin_pass(&passwd, &passwd_size)) {
|
|
*reason = "Could not read pass from stdin.";
|
|
return NULL;
|
|
}
|
|
|
|
/* Restore the original terminal */
|
|
if (tcsetattr(fileno(stdin), TCSAFLUSH, ¤t_term) != 0) {
|
|
*reason = "Could not restore terminal options.";
|
|
free(passwd);
|
|
return NULL;
|
|
}
|
|
} else if (!getline_stdin_pass(&passwd, &passwd_size)) {
|
|
*reason = "Could not read pass from stdin.";
|
|
return NULL;
|
|
}
|
|
|
|
return passwd;
|
|
}
|