openssh: fix (#1875)

This commit is contained in:
Andrea Brancaleoni 2015-06-21 15:59:21 +02:00
parent d51b14a7d5
commit 36a90085e4
2 changed files with 18 additions and 1 deletions

View File

@ -0,0 +1,17 @@
https://bugs.gentoo.org/544078
https://bugzilla.mindrot.org/show_bug.cgi?id=2369
do not try to generate rsa1 keys when ssh1 support is disabled
--- ssh-keygen.c
+++ ssh-keygen.c
@@ -948,7 +948,9 @@ do_gen_all_hostkeys(struct passwd *pw)
char *key_type_display;
char *path;
} key_types[] = {
+#ifdef WITH_SSH1
{ "rsa1", "RSA1", _PATH_HOST_KEY_FILE },
+#endif
{ "rsa", "RSA" ,_PATH_HOST_RSA_KEY_FILE },
{ "dsa", "DSA", _PATH_HOST_DSA_KEY_FILE },
#ifdef OPENSSL_HAS_ECC

View File

@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
version=6.8p1
revision=4
revision=5
build_style=gnu-configure
configure_args="--sbindir=/usr/bin --datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody