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>2015-09-17 13:52:32 +0100
commit70b18066d3921277861e98902c9cf41a10ac6898 (patch)
tree0bfe9fa4fee0c290b5ff1bc1c2977048beecd37b /sshkey.c
parent544df7a04ae5b5c1fc30be7c445ad685d7a02dc9 (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: 2015-09-17 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 cfe598080..2c87d8099 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -116,6 +116,7 @@ static const struct keytype keytypes[] = {
116 { "ssh-dss-cert-v00@openssh.com", "DSA-CERT-V00", 116 { "ssh-dss-cert-v00@openssh.com", "DSA-CERT-V00",
117 KEY_DSA_CERT_V00, 0, 1 }, 117 KEY_DSA_CERT_V00, 0, 1 },
118#endif /* WITH_OPENSSL */ 118#endif /* WITH_OPENSSL */
119 { "null", "null", KEY_NULL, 0, 0 },
119 { NULL, NULL, -1, -1, 0 } 120 { NULL, NULL, -1, -1, 0 }
120}; 121};
121 122
@@ -204,7 +205,7 @@ key_alg_list(int certs_only, int plain_only)
204 const struct keytype *kt; 205 const struct keytype *kt;
205 206
206 for (kt = keytypes; kt->type != -1; kt++) { 207 for (kt = keytypes; kt->type != -1; kt++) {
207 if (kt->name == NULL) 208 if (kt->name == NULL || kt->type == KEY_NULL)
208 continue; 209 continue;
209 if ((certs_only && !kt->cert) || (plain_only && kt->cert)) 210 if ((certs_only && !kt->cert) || (plain_only && kt->cert))
210 continue; 211 continue;