diff options
| -rwxr-xr-x | package/base-files/files/bin/config_generate | 1 | ||||
| -rwxr-xr-x | package/base-files/files/etc/init.d/urandom_seed | 29 | ||||
| -rw-r--r-- | package/base-files/files/lib/preinit/81_urandom_seed | 24 |
3 files changed, 54 insertions, 0 deletions
diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate index 22cc1571aa..7f34eec881 100755 --- a/package/base-files/files/bin/config_generate +++ b/package/base-files/files/bin/config_generate @@ -230,6 +230,7 @@ generate_static_system() { set system.@system[-1].timezone='UTC' set system.@system[-1].ttylogin='0' set system.@system[-1].log_size='64' + set system.@system[-1].urandom_seed='0' delete system.ntp set system.ntp='timeserver' diff --git a/package/base-files/files/etc/init.d/urandom_seed b/package/base-files/files/etc/init.d/urandom_seed new file mode 100755 index 0000000000..cb2eb444fc --- /dev/null +++ b/package/base-files/files/etc/init.d/urandom_seed @@ -0,0 +1,29 @@ +#!/bin/sh /etc/rc.common + +START=99 + +EXTRA_COMMANDS="save" + +_log() { + logger -t urandom_seed "$1" +} + +_save() { + touch $1.tmp || { _log "touch $1 failed"; return; } + chown root:root $1.tmp || { _log "chown $1 failed"; return; } + chmod 600 $1.tmp || { _log "chmod $1 failed"; return; } + getrandom 512 > $1.tmp || { _log "getrandom failed"; return; } + mv $1.tmp $1 || { _log "mv $1 failed"; return; } +} + +save() { + SEED="$(uci -q get system.@system[0].urandom_seed)" + [ "${SEED:0:1}" == "/" ] && _save "$SEED" && _log "Seed saved ($SEED)" + + SEED=/etc/urandom.seed + [ ! -f $SEED ] && _save "$SEED" && _log "Seed saved ($SEED)" +} + +boot() { + save +} diff --git a/package/base-files/files/lib/preinit/81_urandom_seed b/package/base-files/files/lib/preinit/81_urandom_seed new file mode 100644 index 0000000000..10878f3dc2 --- /dev/null +++ b/package/base-files/files/lib/preinit/81_urandom_seed @@ -0,0 +1,24 @@ +#!/bin/sh + +log_urandom_seed() { + echo "urandom-seed: $1" > /dev/kmsg +} + +_do_urandom_seed() { + [ -f "$1" ] || { log_urandom_seed "Seed file not found ($1)"; return; } + [ -O "$1" -a -G "$1" -a ! -x "$1" ] || { log_urandom_seed "Wrong owner / permissions for $1"; return; } + + log_urandom_seed "Seeding with $1" + cat "$1" > /dev/urandom +} + +do_urandom_seed() { + [ -c /dev/urandom ] || { log_urandom_seed "Something is wrong with /dev/urandom"; return; } + + _do_urandom_seed "/etc/urandom.seed" + + SEED="$(uci -q get system.@system[0].urandom_seed)" + [ "${SEED:0:1}" == "/" -a "$SEED" != "/etc/urandom.seed" ] && _do_urandom_seed "$SEED" +} + +boot_hook_add preinit_main do_urandom_seed |