From 84d3989ec82b44d9a30a774c012300db402c1803 Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Fri, 3 Jun 2016 12:40:12 +0200
Subject: [PATCH] Coverity -> FIPS patch

---
 openssh-6.7p1-coverity.patch | 11 -----------
 openssh-7.2p1-fips.patch     |  8 ++++++++
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/openssh-6.7p1-coverity.patch b/openssh-6.7p1-coverity.patch
index d3d40fb..73fe662 100644
--- a/openssh-6.7p1-coverity.patch
+++ b/openssh-6.7p1-coverity.patch
@@ -399,14 +399,3 @@ diff -up openssh-6.8p1/sshd.c.coverity openssh-6.8p1/sshd.c
  }
  
  
-diff -up openssh-6.8p1/sshkey.c.coverity openssh-6.8p1/sshkey.c
---- openssh-6.8p1/sshkey.c.coverity	2015-03-18 17:21:58.285251452 +0100
-+++ openssh-6.8p1/sshkey.c	2015-03-18 17:45:32.232705363 +0100
-@@ -58,6 +58,7 @@
- #include "digest.h"
- #define SSHKEY_INTERNAL
- #include "sshkey.h"
-+#include "log.h"
- #include "match.h"
- 
- /* openssh private key file format */
diff --git a/openssh-7.2p1-fips.patch b/openssh-7.2p1-fips.patch
index 068f7ec..023abaa 100644
--- a/openssh-7.2p1-fips.patch
+++ b/openssh-7.2p1-fips.patch
@@ -628,6 +628,14 @@ diff -up openssh-7.2p1/sshkey.c.fips openssh-7.2p1/sshkey.c
  #endif
  
  #include "crypto_api.h"
+@@ -58,6 +58,7 @@
+ #include "digest.h"
+ #define SSHKEY_INTERNAL
+ #include "sshkey.h"
++#include "log.h"
+ #include "match.h"
+ 
+ /* openssh private key file format */
 @@ -1554,6 +1555,8 @@ rsa_generate_private_key(u_int bits, RSA
  	}
  	if (!BN_set_word(f4, RSA_F4) ||