Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rng-tools: uci-fy, default to doing nothing

Browse source 
Enabling the default configuration will pipe /dev/urandom back into
/dev/random ala the current package behavior.  Because this amounts to
disabling the in-kernel entropy estimation, default disabled.

While here, uci-paramaterize the high watermark.
While here, add a pre-command hook for real RNGs that need 'stty raw'
or other such hooks.  (e.g. the TrueRNG devices)

As offered in github openwrt/packages#3422, take over maintainership.

See github openwrt/packages#3142.

Signed-off-by: Nathaniel Wesley Filardo <nwfilardo@gmail.com>
This commit is contained in:
Nathaniel Wesley Filardo 2016-10-30 18:27:54 -04:00
parent 2b324358e5
commit bce6d283c1
3 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
utils/rng-tools/Makefile
View file

@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=rng-tools PKG_NAME:=rng-tools
PKG_VERSION:=5 PKG_VERSION:=5
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/gkernel/rng-tools/$(PKG_VERSION)/ PKG_SOURCE_URL:=@SF/gkernel/rng-tools/$(PKG_VERSION)/
PKG_MD5SUM:=6726cdc6fae1f5122463f24ae980dd68 PKG_MD5SUM:=6726cdc6fae1f5122463f24ae980dd68
PKG_LICENSE:=GPLv2 PKG_LICENSE:=GPLv2
PKG_MAINTAINER:=Hannu Nyman <hannu.nyman@iki.fi> PKG_MAINTAINER:=Nathaniel Wesley Filardo <nwfilardo@gmail.com>
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
@ -52,6 +52,8 @@ CONFIGURE_ARGS += \
define Package/rng-tools/install define Package/rng-tools/install
$(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/rngd.init $(1)/etc/init.d/rngd $(INSTALL_BIN) ./files/rngd.init $(1)/etc/init.d/rngd
$(INSTALL_DIR) $(1)/etc/uci_defaults
$(INSTALL_BIN) ./files/rngd.uci_defaults $(1)/etc/uci_defaults/rngd
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/rngtest $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/rngtest $(1)/usr/bin/
$(INSTALL_DIR) $(1)/sbin $(INSTALL_DIR) $(1)/sbin

16
utils/rng-tools/files/rngd.init
View file

@ -3,12 +3,20 @@
START=98 START=98
RNGD_AMOUNT=4000 RNGD_FILLWATER=$(uci -q get system.@rngd[0].fill_watermark)
RNGD_DEVICE="/dev/urandom" RNGD_DEVICE=$(uci -q get system.@rngd[0].device)
# Use /dev/urandom as source, as hardware sources like /dev/hwrng are usually not present RNGD_ENABLED=$(uci -q get system.@rngd[0].enabled)
RNGD_PRECMD=$(uci -q get system.@rngd[0].precmd)
: ${RNGD_FILLWATER:=4000}
echo PRECMD=\'$RNGD_PRECMD\'
start() { start() {
service_start /sbin/rngd -r $RNGD_DEVICE -W $RNGD_AMOUNT [ 1 -eq "$RNGD_ENABLED" ] && {
[ -z "${RNGD_PRECMD}" ] || ${RNGD_PRECMD} ${RNGD_DEVICE}
service_start /sbin/rngd -r ${RNGD_DEVICE} -W ${RNGD_FILLWATER}
}
} }
stop() { stop() {

8
utils/rng-tools/files/rngd.uci_defaults Normal file
View file

@ -0,0 +1,8 @@
#!/bin/sh
uci -q show system.@rngd[0] || {
uci add system rngd
uci set system.@rngd[0].enabled=0
uci set system.@rngd[0].device=/dev/urandom
uci commit
}