emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

seedrng: remove environment variables

Browse Source 
Now that we have the command line arguments, there's no need for the
environment variables.

This fixes #511.
This commit is contained in:
Jason A. Donenfeld 2022-03-30 23:15:48 -04:00 committed by William Hubbs
parent 96b0c695d9
commit 586d1c9af3
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/rc/seedrng.c
View File

@ -77,7 +77,6 @@ static char *lock_file = NULL;
static char *seed_dir = NULL; static char *seed_dir = NULL;
static char *creditable_seed = NULL; static char *creditable_seed = NULL;
static char *non_creditable_seed = NULL; static char *non_creditable_seed = NULL;
static bool skip_credit = false;
enum blake2s_lengths { enum blake2s_lengths {
BLAKE2S_BLOCK_LEN = 64, BLAKE2S_BLOCK_LEN = 64,
@ -405,20 +404,10 @@ static int seed_from_file_if_exists(const char *filename, bool credit, struct bl
static void populate_global_paths(void) static void populate_global_paths(void)
{ {
if (!lock_file) { if (!lock_file)
lock_file = xstrdup(getenv("SEEDRNG_LOCK_FILE")); lock_file = xstrdup("/var/run/seedrng.lock");
if (!lock_file || !*lock_file) { if (!seed_dir)
free(lock_file); seed_dir = xstrdup("/var/lib/seedrng");
lock_file = xstrdup("/var/run/seedrng.lock");
}
}
if (!seed_dir) {
seed_dir = xstrdup(getenv("SEEDRNG_SEED_DIR"));
if (!seed_dir || !*seed_dir) {
free(seed_dir);
seed_dir = xstrdup("/var/lib/seedrng");
}
}
xasprintf(&creditable_seed, "%s/seed.credit", seed_dir); xasprintf(&creditable_seed, "%s/seed.credit", seed_dir);
xasprintf(&non_creditable_seed, "%s/seed.no-credit", seed_dir); xasprintf(&non_creditable_seed, "%s/seed.no-credit", seed_dir);
} }
@ -442,6 +431,7 @@ int main(int argc, char **argv)
bool new_seed_creditable; bool new_seed_creditable;
struct timespec realtime = { 0 }, boottime = { 0 }; struct timespec realtime = { 0 }, boottime = { 0 };
struct blake2s_state hash; struct blake2s_state hash;
bool skip_credit = false;
atexit(cleanup); atexit(cleanup);
applet = basename_c(argv[0]); applet = basename_c(argv[0]);
@ -489,9 +479,7 @@ int main(int argc, char **argv)
ret = seed_from_file_if_exists(non_creditable_seed, false, &hash); ret = seed_from_file_if_exists(non_creditable_seed, false, &hash);
if (ret < 0) if (ret < 0)
program_ret |= 1 << 1; program_ret |= 1 << 1;
ret = seed_from_file_if_exists(creditable_seed, ret = seed_from_file_if_exists(creditable_seed, !skip_credit, &hash);
skip_credit ? !skip_credit : !rc_yesno(getenv("SEEDRNG_SKIP_CREDIT")),
&hash);
if (ret < 0) if (ret < 0)
program_ret |= 1 << 2; program_ret |= 1 << 2;