Revert "The earlier commit ea119211b2 removed 'dsa' as one of the ssh_host_*_key"

The author (@pprindeville) of the original commit noted that the wrong
commit was picked, see
https://github.com/openwrt/packages/commit/325b7d2cd2d6e9d4903c6e7628c7c9ae0ddab564#commitcomment-22387528
"Err... looks like the wrong fix got committed. I was hoping that this
commit d902e5d would have gone in instead."

This reverts commit 325b7d2cd2.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle
2017-06-03 17:12:26 +02:00
parent 93ae6db928
commit d96c092a00
2 changed files with 1 additions and 14 deletions
+1 -1
View File
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openssh
PKG_VERSION:=7.5p1
PKG_RELEASE:=2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
@@ -1,13 +0,0 @@
--- a/servconf.c 2017-03-19 20:39:27.000000000 -0600
+++ b/servconf.c 2017-06-01 19:12:51.338645002 -0600
@@ -201,8 +201,10 @@
/* fill default hostkeys for protocols */
options->host_key_files[options->num_host_key_files++] =
_PATH_HOST_RSA_KEY_FILE;
+#if 0
options->host_key_files[options->num_host_key_files++] =
_PATH_HOST_DSA_KEY_FILE;
+#endif
#ifdef OPENSSL_HAS_ECC
options->host_key_files[options->num_host_key_files++] =
_PATH_HOST_ECDSA_KEY_FILE;