jonathan/openssh
1
0
Fork 0
forked from rpms/openssh
Code Pull Requests Activity

Having no keys is not fatal in gssapi key exchange (#1261414)

Browse Source
This commit is contained in:
Jakub Jelen 2015-09-23 16:06:46 +02:00
parent 9a804fa266
commit 6bf47e3d35
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openssh-6.6p1-gsskex.patch
View File

@ -2476,6 +2476,18 @@ diff -up openssh-7.0p1/sshconnect2.c.gsskex openssh-7.0p1/sshconnect2.c
diff -up openssh-7.0p1/sshd.c.gsskex openssh-7.0p1/sshd.c diff -up openssh-7.0p1/sshd.c.gsskex openssh-7.0p1/sshd.c
--- openssh-7.0p1/sshd.c.gsskex 2015-08-12 11:15:43.679548913 +0200 --- openssh-7.0p1/sshd.c.gsskex 2015-08-12 11:15:43.679548913 +0200
+++ openssh-7.0p1/sshd.c 2015-08-12 11:15:43.702548876 +0200 +++ openssh-7.0p1/sshd.c 2015-08-12 11:15:43.702548876 +0200
@@ -1043,8 +1043,9 @@ notify_hostkeys(struct ssh *ssh)
}
debug3("%s: sent %d hostkeys", __func__, nkeys);
if (nkeys == 0)
- fatal("%s: no hostkeys", __func__);
- packet_send();
+ debug3("%s: no hostkeys", __func__);
+ else
+ packet_send();
sshbuf_free(buf);
}
@@ -1843,10 +1843,13 @@ main(int ac, char **av) @@ -1843,10 +1843,13 @@ main(int ac, char **av)
logit("Disabling protocol version 1. Could not load host key"); logit("Disabling protocol version 1. Could not load host key");
options.protocol &= ~SSH_PROTO_1; options.protocol &= ~SSH_PROTO_1;