mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 15:56:49 +00:00
dropbear: remove generation and configuration of DSS keys
Signed-off-by: Steven Barth <steven@midlink.org> SVN-Revision: 46815
This commit is contained in:
parent
a4cf4c35af
commit
8a7a939470
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user