summaryrefslogtreecommitdiff
path: root/sshkey.c
diff options
context:
space:
mode:
authorSimon Wilkinson <simon@sxw.org.uk>2014-02-09 16:09:48 +0000
committerColin Watson <cjwatson@debian.org>2018-08-24 17:49:04 +0100
commite6c7c11ac2576ac62334616bd4408bf64140bba7 (patch)
tree0625a34b2eafa6425602cb8c7185fbddc2d05fd7 /sshkey.c
parente6547182a54f0f268ee36e7c99319eeddffbaff2 (diff)
GSSAPI key exchange support
This patch has been rejected upstream: "None of the OpenSSH developers are in favour of adding this, and this situation has not changed for several years. This is not a slight on Simon's patch, which is of fine quality, but just that a) we don't trust GSSAPI implementations that much and b) we don't like adding new KEX since they are pre-auth attack surface. This one is particularly scary, since it requires hooks out to typically root-owned system resources." However, quite a lot of people rely on this in Debian, and it's better to have it merged into the main openssh package rather than having separate -krb5 packages (as we used to have). It seems to have a generally good security history. Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1242 Last-Updated: 2018-08-24 Patch-Name: gssapi.patch
Diffstat (limited to 'sshkey.c')
-rw-r--r--sshkey.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sshkey.c b/sshkey.c
index 72c08c7e0..91e99a262 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -140,6 +140,7 @@ static const struct keytype keytypes[] = {
140# endif /* OPENSSL_HAS_NISTP521 */ 140# endif /* OPENSSL_HAS_NISTP521 */
141# endif /* OPENSSL_HAS_ECC */ 141# endif /* OPENSSL_HAS_ECC */
142#endif /* WITH_OPENSSL */ 142#endif /* WITH_OPENSSL */
143 { "null", "null", NULL, KEY_NULL, 0, 0, 0 },
143 { NULL, NULL, NULL, -1, -1, 0, 0 } 144 { NULL, NULL, NULL, -1, -1, 0, 0 }
144}; 145};
145 146
@@ -228,7 +229,7 @@ sshkey_alg_list(int certs_only, int plain_only, int include_sigonly, char sep)
228 const struct keytype *kt; 229 const struct keytype *kt;
229 230
230 for (kt = keytypes; kt->type != -1; kt++) { 231 for (kt = keytypes; kt->type != -1; kt++) {
231 if (kt->name == NULL) 232 if (kt->name == NULL || kt->type == KEY_NULL)
232 continue; 233 continue;
233 if (!include_sigonly && kt->sigonly) 234 if (!include_sigonly && kt->sigonly)
234 continue; 235 continue;