From c4c52b0667e03bf3c2fccf6a0df5b533d5f3b30e Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Sep 09 2015 08:59:19 +0000
Subject: Fix warnings produced by gcc


related to
 * ssh-keysign and fingerprint algorithms
 * ssh and GSSAPI algorithms validation

---

diff --git a/openssh-7.0p1-gssKexAlgorithms.patch b/openssh-7.0p1-gssKexAlgorithms.patch
index 9ea42e3..b8fe76c 100644
--- a/openssh-7.0p1-gssKexAlgorithms.patch
+++ b/openssh-7.0p1-gssKexAlgorithms.patch
@@ -94,6 +94,14 @@ diff -up openssh-7.0p1/gss-serv.c.gsskexalg openssh-7.0p1/gss-serv.c
 diff -up openssh-7.0p1/kex.c.gsskexalg openssh-7.0p1/kex.c
 --- openssh-7.0p1/kex.c.gsskexalg	2015-08-19 12:28:38.078518839 +0200
 +++ openssh-7.0p1/kex.c	2015-08-19 12:30:13.249306371 +0200
+@@ -50,6 +50,7 @@
+ #include "dispatch.h"
+ #include "monitor.h"
+ #include "roaming.h"
++#include "xmalloc.h"
+ 
+ #include "ssherr.h"
+ #include "sshbuf.h"
 @@ -232,6 +232,29 @@ kex_assemble_names(const char *def, char
  	return 0;
  }
diff --git a/openssh-7.0p1-show-more-fingerprints.patch b/openssh-7.0p1-show-more-fingerprints.patch
index 368f152..52f9535 100644
--- a/openssh-7.0p1-show-more-fingerprints.patch
+++ b/openssh-7.0p1-show-more-fingerprints.patch
@@ -312,6 +312,20 @@ index 7751031..82ed92e 100644
  	    SSH_FP_DEFAULT)) == NULL) {
  		error("%s: sshkey_fingerprint failed", __func__);
  		goto out;
+diff --git a/ssh-keysign.c b/ssh-keysign.c
+index 1dca3e2..23bff7d 100644
+--- a/ssh-keysign.c
++++ b/ssh-keysign.c
+@@ -275,7 +275,7 @@ main(int argc, char **argv)
+ 		}
+ 	}
+ 	if (!found) {
+-		if ((fp = sshkey_fingerprint(key, options.fingerprint_hash,
++		if ((fp = sshkey_fingerprint(key, options.fingerprint_hash[0],
+ 		    SSH_FP_DEFAULT)) == NULL)
+ 			fatal("%s: sshkey_fingerprint failed", __func__);
+ 		fatal("no matching hostkey found for key %s %s",
+
 -- 
 2.1.0