fff-sysupgrade: Keep ed25519 and ecdsa host key on system upgrade

Dropbear supports ed25519 keys since OpenWrt 21.02.
Also, ecdsa is supported since v19.07, but disabled in our firmware.

Keep the generated ed25519 and ecdsa host key accross upgrades.

While at it, remove dss host keys, as they are not supported anymore.

5eb7864aadd5 ("dropbear: rewrite init script startup logic to handle both host key files")
8a7a93947004 ("dropbear: remove generation and configuration of DSS keys")

Signed-off-by: Fabian Bläse <fabian@blaese.de>
Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Fabian Bläse 2021-06-13 10:58:25 +02:00 committed by Adrian Schmutzler
parent 649886223f
commit 8702fdd823
2 changed files with 3 additions and 2 deletions

View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fff-sysupgrade
PKG_RELEASE:=12
PKG_RELEASE:=13
include $(INCLUDE_DIR)/package.mk

View File

@ -4,8 +4,9 @@
cat > /etc/sysupgrade.conf <<-__EOF__
/etc/shadow
/etc/dropbear/dropbear_dss_host_key
/etc/dropbear/dropbear_rsa_host_key
/etc/dropbear/dropbear_ecdsa_host_key
/etc/dropbear/dropbear_ed25519_host_key
/etc/dropbear/authorized_keys
/etc/network.config
/etc/config/fff