jonathan/openssh
1
0
Fork 0
forked from rpms/openssh
Code Pull Requests Activity

The FIPS_mode() is in different header file

Browse Source
This commit is contained in:
Jakub Jelen 2019-03-21 17:02:28 +01:00
parent 91aa3d4921
commit cb35953bec
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
openssh-7.7p1-fips.patch
View File

@ -5,7 +5,7 @@ diff -up openssh-7.9p1/cipher.c.fips openssh-7.9p1/cipher.c
#include <sys/types.h> #include <sys/types.h>
+#include <openssl/fips.h> +#include <openssl/crypto.h>
+ +
#include <string.h> #include <string.h>
#include <stdarg.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 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.fips 2019-03-11 17:06:37.614877975 +0100
+++ openssh-7.9p1/kex.c 2019-03-11 17:06:37.621878041 +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[] = { @@ -122,6 +123,26 @@ static const struct kexalg kexalgs[] = {
{ NULL, -1, -1, -1}, { NULL, -1, -1, -1},
}; };
@ -252,7 +244,7 @@ diff -up openssh-7.9p1/kexgexc.c.fips openssh-7.9p1/kexgexc.c
#ifdef WITH_OPENSSL #ifdef WITH_OPENSSL
+#include <openssl/fips.h> +#include <openssl/crypto.h>
#include <sys/types.h> #include <sys/types.h>
#include <openssl/dh.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 <sys/types.h>
+#include <openssl/fips.h> +#include <openssl/crypto.h>
+ +
#include <string.h> #include <string.h>
#include <stdio.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/evp.h>
#include <openssl/err.h> #include <openssl/err.h>
#endif #endif
+#include <openssl/fips.h> +#include <openssl/crypto.h>
+#include <fipscheck.h> +#include <fipscheck.h>
#include "openbsd-compat/openssl-compat.h" #include "openbsd-compat/openssl-compat.h"
#include "openbsd-compat/sys-queue.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> #include <vis.h>
#endif #endif
+#include <openssl/fips.h> +#include <openssl/crypto.h>
+ +
#include "openbsd-compat/sys-queue.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/dh.h>
#include <openssl/bn.h> #include <openssl/bn.h>
#include <openssl/rand.h> #include <openssl/rand.h>
+#include <openssl/fips.h> +#include <openssl/crypto.h>
+#include <fipscheck.h> +#include <fipscheck.h>
#include "openbsd-compat/openssl-compat.h" #include "openbsd-compat/openssl-compat.h"
#endif #endif
@ -752,7 +744,7 @@ diff -up openssh-7.9p1/sshkey.c.fips openssh-7.9p1/sshkey.c
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/pem.h> #include <openssl/pem.h>
+#include <openssl/fips.h> +#include <openssl/crypto.h>
#endif #endif
#include "crypto_api.h" #include "crypto_api.h"