vapier 15/03/25 21:03:54 Modified: openssh-6.8_p1-ssh-keygen-no-ssh1.patch Log: Update to the version merged upstream that also fixes USE=-ssl behavior.
Revision Changes Path 1.2 net-misc/openssh/files/openssh-6.8_p1-ssh-keygen-no-ssh1.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.8_p1-ssh-keygen-no-ssh1.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.8_p1-ssh-keygen-no-ssh1.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.8_p1-ssh-keygen-no-ssh1.patch?r1=1.1&r2=1.2 Index: openssh-6.8_p1-ssh-keygen-no-ssh1.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-misc/openssh/files/openssh-6.8_p1-ssh-keygen-no-ssh1.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openssh-6.8_p1-ssh-keygen-no-ssh1.patch 22 Mar 2015 19:48:09 -0000 1.1 +++ openssh-6.8_p1-ssh-keygen-no-ssh1.patch 25 Mar 2015 21:03:54 -0000 1.2 @@ -1,17 +1,40 @@ 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 +From 117c961c8d1f0537973df5a6a937389b4b7b61b4 Mon Sep 17 00:00:00 2001 +From: "[email protected]" <[email protected]> +Date: Mon, 23 Mar 2015 06:06:38 +0000 +Subject: [PATCH] upstream commit +for ssh-keygen -A, don't try (and fail) to generate ssh + v.1 keys when compiled without SSH1 support RSA/DSA/ECDSA keys when compiled + without OpenSSL based on patch by Mike Frysinger; bz#2369 +--- + ssh-keygen.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/ssh-keygen.c b/ssh-keygen.c +index a3c2362..96dd8b4 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c -@@ -948,7 +948,9 @@ do_gen_all_hostkeys(struct passwd *pw) +@@ -948,12 +948,16 @@ do_gen_all_hostkeys(struct passwd *pw) char *key_type_display; char *path; } key_types[] = { ++#ifdef WITH_OPENSSL +#ifdef WITH_SSH1 { "rsa1", "RSA1", _PATH_HOST_KEY_FILE }, -+#endif ++#endif /* WITH_SSH1 */ { "rsa", "RSA" ,_PATH_HOST_RSA_KEY_FILE }, { "dsa", "DSA", _PATH_HOST_DSA_KEY_FILE }, #ifdef OPENSSL_HAS_ECC + { "ecdsa", "ECDSA",_PATH_HOST_ECDSA_KEY_FILE }, +-#endif ++#endif /* OPENSSL_HAS_ECC */ ++#endif /* WITH_OPENSSL */ + { "ed25519", "ED25519",_PATH_HOST_ED25519_KEY_FILE }, + { NULL, NULL, NULL } + }; +-- +2.3.3 +
