From cb35953bec4ef9e37f4635e0a9a332285762ef06 Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Thu, 21 Mar 2019 17:02:28 +0100
Subject: [PATCH] The FIPS_mode() is in different header file

---
 openssh-7.7p1-fips.patch | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/openssh-7.7p1-fips.patch b/openssh-7.7p1-fips.patch
index 89867b1..bdaf525 100644
--- a/openssh-7.7p1-fips.patch
+++ b/openssh-7.7p1-fips.patch
@@ -5,7 +5,7 @@ diff -up openssh-7.9p1/cipher.c.fips openssh-7.9p1/cipher.c
  
  #include <sys/types.h>
  
-+#include <openssl/fips.h>
++#include <openssl/crypto.h>
 +
  #include <string.h>
  #include <stdarg.h>
@@ -180,14 +180,6 @@ diff -up openssh-7.9p1/entropy.c.fips openssh-7.9p1/entropy.c
 diff -up openssh-7.9p1/kex.c.fips openssh-7.9p1/kex.c
 --- openssh-7.9p1/kex.c.fips	2019-03-11 17:06:37.614877975 +0100
 +++ openssh-7.9p1/kex.c	2019-03-11 17:06:37.621878041 +0100
-@@ -35,6 +35,7 @@
- #ifdef WITH_OPENSSL
- #include <openssl/crypto.h>
- #include <openssl/dh.h>
-+#include <openssl/fips.h>
- #endif
- 
- #include "ssh2.h"
 @@ -122,6 +123,26 @@ static const struct kexalg kexalgs[] = {
  	{ NULL, -1, -1, -1},
  };
@@ -252,7 +244,7 @@ diff -up openssh-7.9p1/kexgexc.c.fips openssh-7.9p1/kexgexc.c
  
  #ifdef WITH_OPENSSL
  
-+#include <openssl/fips.h>
++#include <openssl/crypto.h>
  #include <sys/types.h>
  
  #include <openssl/dh.h>
@@ -298,7 +290,7 @@ diff -up openssh-7.9p1/mac.c.fips openssh-7.9p1/mac.c
  
  #include <sys/types.h>
  
-+#include <openssl/fips.h>
++#include <openssl/crypto.h>
 +
  #include <string.h>
  #include <stdio.h>
@@ -539,7 +531,7 @@ diff -up openssh-7.9p1/ssh.c.fips openssh-7.9p1/ssh.c
  #include <openssl/evp.h>
  #include <openssl/err.h>
  #endif
-+#include <openssl/fips.h>
++#include <openssl/crypto.h>
 +#include <fipscheck.h>
  #include "openbsd-compat/openssl-compat.h"
  #include "openbsd-compat/sys-queue.h"
@@ -587,7 +579,7 @@ diff -up openssh-7.9p1/sshconnect2.c.fips openssh-7.9p1/sshconnect2.c
  #include <vis.h>
  #endif
  
-+#include <openssl/fips.h>
++#include <openssl/crypto.h>
 +
  #include "openbsd-compat/sys-queue.h"
  
@@ -682,7 +674,7 @@ diff -up openssh-7.9p1/sshd.c.fips openssh-7.9p1/sshd.c
  #include <openssl/dh.h>
  #include <openssl/bn.h>
  #include <openssl/rand.h>
-+#include <openssl/fips.h>
++#include <openssl/crypto.h>
 +#include <fipscheck.h>
  #include "openbsd-compat/openssl-compat.h"
  #endif
@@ -752,7 +744,7 @@ diff -up openssh-7.9p1/sshkey.c.fips openssh-7.9p1/sshkey.c
  #include <openssl/evp.h>
  #include <openssl/err.h>
  #include <openssl/pem.h>
-+#include <openssl/fips.h>
++#include <openssl/crypto.h>
  #endif
  
  #include "crypto_api.h"