diff options
| author | Steven Barth <cyrus@openwrt.org> | 2015-09-08 08:59:40 +0000 |
|---|---|---|
| committer | Steven Barth <cyrus@openwrt.org> | 2015-09-08 08:59:40 +0000 |
| commit | 8a7a9394700455150c3c7a372565b96294ed05e4 (patch) | |
| tree | abec6a2b4900e134646f07fe95f4e4529504405f | |
| parent | a4cf4c35af05d8128ca7887c4f9c6c2cb53102bb (diff) | |
| download | upstream-8a7a9394700455150c3c7a372565b96294ed05e4.tar.gz upstream-8a7a9394700455150c3c7a372565b96294ed05e4.tar.bz2 upstream-8a7a9394700455150c3c7a372565b96294ed05e4.zip | |
dropbear: remove generation and configuration of DSS keys
Signed-off-by: Steven Barth <steven@midlink.org>
SVN-Revision: 46815
| -rw-r--r-- | package/network/services/dropbear/Makefile | 4 | ||||
| -rwxr-xr-x | package/network/services/dropbear/files/dropbear.init | 9 |
2 files changed, 4 insertions, 9 deletions
diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile index f140f36dcc..4515165ad4 100644 --- a/package/network/services/dropbear/Makefile +++ b/package/network/services/dropbear/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dropbear PKG_VERSION:=2015.68 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ @@ -48,7 +48,6 @@ endef define Package/dropbear/conffiles /etc/dropbear/dropbear_rsa_host_key -/etc/dropbear/dropbear_dss_host_key /etc/config/dropbear endef @@ -118,7 +117,6 @@ define Package/dropbear/install $(INSTALL_DIR) $(1)/usr/lib/opkg/info $(INSTALL_DIR) $(1)/etc/dropbear touch $(1)/etc/dropbear/dropbear_rsa_host_key - touch $(1)/etc/dropbear/dropbear_dss_host_key endef define Package/dropbearconvert/install diff --git a/package/network/services/dropbear/files/dropbear.init b/package/network/services/dropbear/files/dropbear.init index 6de0142728..01d88afd17 100755 --- a/package/network/services/dropbear/files/dropbear.init +++ b/package/network/services/dropbear/files/dropbear.init @@ -37,7 +37,6 @@ validate_section_dropbear() 'RootPasswordAuth:bool:1' \ 'RootLogin:bool:1' \ 'rsakeyfile:file' \ - 'dsskeyfile:file' \ 'BannerFile:file' \ 'Port:list(port):22' \ 'SSHKeepAlive:uinteger:300' \ @@ -49,7 +48,7 @@ dropbear_instance() { local PasswordAuth enable Interface GatewayPorts \ RootPasswordAuth RootLogin rsakeyfile \ - dsskeyfile BannerFile Port SSHKeepAlive IdleTimeout \ + BannerFile Port SSHKeepAlive IdleTimeout \ mdns ipaddrs validate_section_dropbear "${1}" || { @@ -75,7 +74,6 @@ dropbear_instance() [ "${RootPasswordAuth}" -eq 0 ] && procd_append_param command -g [ "${RootLogin}" -eq 0 ] && procd_append_param command -w [ -n "${rsakeyfile}" ] && procd_append_param command -r "${rsakeyfile}" - [ -n "${dsskeyfile}" ] && procd_append_param command -d "${dsskeyfile}" [ -n "${BannerFile}" ] && procd_append_param command -b "${BannerFile}" append_ports "${ipaddrs}" "${Port}" [ "${IdleTimeout}" -ne 0 ] && procd_append_param command -I "${IdleTimeout}" @@ -86,7 +84,7 @@ dropbear_instance() keygen() { - for keytype in rsa dss; do + for keytype in rsa; do # check for keys key=dropbear/dropbear_${keytype}_host_key [ -f /tmp/$key -o -s /etc/$key ] || { @@ -109,8 +107,7 @@ keygen() start_service() { - [ -s /etc/dropbear/dropbear_rsa_host_key -a \ - -s /etc/dropbear/dropbear_dss_host_key ] || keygen + [ -s /etc/dropbear/dropbear_rsa_host_key ] || keygen . /lib/functions.sh . /lib/functions/network.sh |