diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-03-25 21:03:54 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-03-25 21:03:54 +0000 |
| commit | fbf2299b72d3ed2319c36c0f49c22745a62c4709 (patch) | |
| tree | daebfb10ea92bde12cb2b19013a886f5d192f109 /net-misc | |
| parent | Add ruby22. (diff) | |
| download | historical-fbf2299b72d3ed2319c36c0f49c22745a62c4709.tar.gz historical-fbf2299b72d3ed2319c36c0f49c22745a62c4709.tar.bz2 historical-fbf2299b72d3ed2319c36c0f49c22745a62c4709.zip | |
Update to the version merged upstream that also fixes USE=-ssl behavior.
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/openssh/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/openssh/files/openssh-6.8_p1-ssh-keygen-no-ssh1.patch | 29 |
2 files changed, 31 insertions, 4 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index a6b01d14ebfa..1a41de5dcd06 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/openssh # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.555 2015/03/24 07:07:13 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.556 2015/03/25 21:03:54 vapier Exp $ + + 25 Mar 2015; Mike Frysinger <vapier@gentoo.org> + files/openssh-6.8_p1-ssh-keygen-no-ssh1.patch: + Update to the version merged upstream that also fixes USE=-ssl behavior. 24 Mar 2015; Patrick Lauer <patrick@gentoo.org> openssh-6.8_p1-r1.ebuild, openssh-6.8_p1-r2.ebuild: diff --git a/net-misc/openssh/files/openssh-6.8_p1-ssh-keygen-no-ssh1.patch b/net-misc/openssh/files/openssh-6.8_p1-ssh-keygen-no-ssh1.patch index 8b70818e444a..e14a728f43a3 100644 --- a/net-misc/openssh/files/openssh-6.8_p1-ssh-keygen-no-ssh1.patch +++ b/net-misc/openssh/files/openssh-6.8_p1-ssh-keygen-no-ssh1.patch @@ -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: "djm@openbsd.org" <djm@openbsd.org> +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 + |