Having no keys is not fatal in gssapi key exchange (#1261414)
This commit is contained in:
parent
a78d20aea9
commit
88e0ad5272
@ -2476,6 +2476,18 @@ diff -up openssh/sshconnect2.c.gsskex openssh/sshconnect2.c
|
|||||||
diff -up openssh/sshd.c.gsskex openssh/sshd.c
|
diff -up openssh/sshd.c.gsskex openssh/sshd.c
|
||||||
--- openssh/sshd.c.gsskex 2015-06-24 11:07:36.217389832 +0200
|
--- openssh/sshd.c.gsskex 2015-06-24 11:07:36.217389832 +0200
|
||||||
+++ openssh/sshd.c 2015-06-24 11:07:36.235389787 +0200
|
+++ openssh/sshd.c 2015-06-24 11:07:36.235389787 +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);
|
||||||
|
}
|
||||||
|
|
||||||
@@ -1839,10 +1839,13 @@ main(int ac, char **av)
|
@@ -1839,10 +1839,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;
|
||||||
|
Loading…
Reference in New Issue
Block a user