aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-06-16 06:15:24 +00:00
Code

Feature: Added support for PRNG_SEED_TYPE_STATIC, and PRNG_SEED_TYPE_PROFILE

Browse Source
This commit is contained in:
Philipp Schafft 2020-10-22 09:20:56 +00:00
parent 6091b6b278
commit f688dce8a5
3 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cfgfile.c
View File

@ -2552,6 +2552,10 @@ static void _parse_security(xmlDocPtr doc,
seed->type = PRNG_SEED_TYPE_READ_WRITE;
} else if (strcmp(tmp, "device") == 0) {
seed->type = PRNG_SEED_TYPE_DEVICE;
} else if (strcmp(tmp, "static") == 0) {
seed->type = PRNG_SEED_TYPE_STATIC;
} else if (strcmp(tmp, "profile") == 0) {
seed->type = PRNG_SEED_TYPE_PROFILE;
} else {
ICECAST_LOG_WARN("Unknown type for <prng-seed>: %s", tmp);
}

4
src/cfgfile.h
View File

@ -204,7 +204,9 @@ typedef struct {
typedef enum {
PRNG_SEED_TYPE_READ_ONCE,
PRNG_SEED_TYPE_READ_WRITE,
PRNG_SEED_TYPE_DEVICE
PRNG_SEED_TYPE_DEVICE,
PRNG_SEED_TYPE_STATIC,
PRNG_SEED_TYPE_PROFILE
} prng_seed_type_t;
typedef struct prng_seed_config_tag prng_seed_config_t;

48
src/prng.c
View File

@ -98,6 +98,38 @@ static void prng_cross_seed(void)
#endif
}
static void prng_read_seeds(prng_seed_config_t *seed, int configure_time)
{
while (seed) {
switch (seed->type) {
case PRNG_SEED_TYPE_READ_ONCE:
case PRNG_SEED_TYPE_READ_WRITE:
if (configure_time)
prng_read_file(seed->filename, seed->size);
break;
case PRNG_SEED_TYPE_DEVICE:
prng_read_file(seed->filename, seed->size);
break;
case PRNG_SEED_TYPE_STATIC:
prng_write(seed->filename, strlen(seed->filename));
break;
case PRNG_SEED_TYPE_PROFILE:
if (strcmp(seed->filename, "linux") == 0) {
if (configure_time) {
prng_read_file("/proc/sys/kernel/random/boot_id", -1);
prng_read_file("/etc/machine-id", -1);
}
prng_read_file("/proc/sys/kernel/random/uuid", -1);
}
if (strcmp(seed->filename, "linux") == 0 || strcmp(seed->filename, "bsd") == 0) {
prng_read_file("/dev/urandom", 64);
}
break;
}
seed = seed->next;
}
}
void prng_initialize(void)
{
if (initialized)
@ -127,15 +159,10 @@ void prng_shutdown(void)
void prng_configure(ice_config_t *config)
{
prng_seed_config_t *seed = config->prng_seed;
if (!initialized)
return;
while (seed) {
prng_read_file(seed->filename, seed->size);
seed = seed->next;
}
prng_read_seeds(config->prng_seed, 1);
prng_cross_seed();
}
@ -162,7 +189,6 @@ void prng_auto_reseed(void)
{
int need_seeding;
ice_config_t *config;
prng_seed_config_t *seed;
thread_mutex_lock(&digest_a_lock);
need_seeding = before_reseed == 0;
@ -172,13 +198,7 @@ void prng_auto_reseed(void)
return;
config = config_get_config();
seed = config->prng_seed;
while (seed) {
if (seed->type == PRNG_SEED_TYPE_DEVICE) {
prng_read_file(seed->filename, seed->size);
}
seed = seed->next;
}
prng_read_seeds(config->prng_seed, 0);
config_release_config();
prng_cross_seed();
}