From c6ba7b1e095d2533116098f0e8e71d39df83d26c Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Thu, 17 Sep 2015 18:11:59 +0200
Subject: [PATCH] Return back forgotten patch which prevent connection using
 GSSAPI key exchange (#1261414)

---
 openssh-6.6p1-gsskex.patch | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/openssh-6.6p1-gsskex.patch b/openssh-6.6p1-gsskex.patch
index cdf70b6..fa67de1 100644
--- a/openssh-6.6p1-gsskex.patch
+++ b/openssh-6.6p1-gsskex.patch
@@ -2695,3 +2695,26 @@ diff -up openssh-7.0p1/ssh-gss.h.gsskex openssh-7.0p1/ssh-gss.h
  #endif /* GSSAPI */
  
  #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[] =
+ #  endif /* OPENSSL_HAS_NISTP521 */
+ # endif /* OPENSSL_HAS_ECC */
+ #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_DSA_CERT,
+ 	KEY_ECDSA_CERT,
+ 	KEY_ED25519_CERT,
++	KEY_NULL,
+ 	KEY_UNSPEC
+ };
+