Return back forgotten patch which prevent connection using GSSAPI key exchange (#1261414)
This commit is contained in:
parent
851c2edb82
commit
76d20b5d73
@ -2695,3 +2695,26 @@ diff -up openssh/ssh-gss.h.gsskex openssh/ssh-gss.h
|
|||||||
#endif /* GSSAPI */
|
#endif /* GSSAPI */
|
||||||
|
|
||||||
#endif /* _SSH_GSS_H */
|
#endif /* _SSH_GSS_H */
|
||||||
|
|
||||||
|
diff -up openssh-7.1p1/sshkey.c.gsskex openssh-7.1p1/sshkey.c
|
||||||
|
--- openssh-7.1p1/sshkey.c.gsskex 2015-09-17 15:54:32.135673460 +0200
|
||||||
|
+++ openssh-7.1p1/sshkey.c 2015-09-17 15:55:23.014666159 +0200
|
||||||
|
@@ -112,6 +112,7 @@ static const struct keytype keytypes[] =
|
||||||
|
{ "ssh-dss-cert-v00@openssh.com", "DSA-CERT-V00",
|
||||||
|
KEY_DSA_CERT_V00, 0, 1 },
|
||||||
|
#endif /* WITH_OPENSSL */
|
||||||
|
+ { "null", "null", KEY_NULL, 0, 0 },
|
||||||
|
{ NULL, NULL, -1, -1, 0 }
|
||||||
|
};
|
||||||
|
|
||||||
|
diff -up openssh-7.1p1/sshkey.h.gsskex openssh-7.1p1/sshkey.h
|
||||||
|
--- openssh-7.1p1/sshkey.h.gsskex 2015-09-17 15:54:32.135673460 +0200
|
||||||
|
+++ openssh-7.1p1/sshkey.h 2015-09-17 15:55:45.885662877 +0200
|
||||||
|
@@ -62,6 +62,7 @@ enum sshkey_types {
|
||||||
|
KEY_ED25519_CERT,
|
||||||
|
KEY_RSA_CERT_V00,
|
||||||
|
KEY_DSA_CERT_V00,
|
||||||
|
+ KEY_NULL,
|
||||||
|
KEY_UNSPEC
|
||||||
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user