Blame SOURCES/mingw-openssl-fix-fips-build-failure.patch

aa8173
--- openssl-1.0.1c/crypto/fips/fips_rand_selftest.c.orig	2012-11-03 18:59:03.620066556 +0100
aa8173
+++ openssl-1.0.1c/crypto/fips/fips_rand_selftest.c	2012-11-03 19:57:33.156686682 +0100
aa8173
@@ -47,6 +47,8 @@
aa8173
  *
aa8173
  */
aa8173
 
aa8173
+#ifdef OPENSSL_FIPS
aa8173
+
aa8173
 #include <string.h>
aa8173
 #include <openssl/err.h>
aa8173
 #include <openssl/fips.h>
aa8173
@@ -54,8 +56,6 @@
aa8173
 #include <openssl/fips_rand.h>
aa8173
 #include "fips_locl.h"
aa8173
 
aa8173
-#ifdef OPENSSL_FIPS
aa8173
-
aa8173
 typedef struct {
aa8173
     unsigned char DT[16];
aa8173
     unsigned char V[16];
aa8173
--- openssl-1.0.1c/crypto/fips/fips_dsa_selftest.c.orig	2012-11-03 20:03:20.546180631 +0100
aa8173
+++ openssl-1.0.1c/crypto/fips/fips_dsa_selftest.c	2012-11-03 20:03:46.069328396 +0100
aa8173
@@ -47,6 +47,8 @@
aa8173
  *
aa8173
  */
aa8173
 
aa8173
+#ifdef OPENSSL_FIPS
aa8173
+
aa8173
 #include <string.h>
aa8173
 #include <openssl/crypto.h>
aa8173
 #include <openssl/dsa.h>
aa8173
@@ -56,8 +58,6 @@
aa8173
 #include <openssl/bn.h>
aa8173
 #include "fips_locl.h"
aa8173
 
aa8173
-#ifdef OPENSSL_FIPS
aa8173
-
aa8173
 static const unsigned char dsa_test_2048_p[] = {
aa8173
     0xa8, 0x53, 0x78, 0xd8, 0xfd, 0x3f, 0x8d, 0x72, 0xec, 0x74, 0x18, 0x08,
aa8173
     0x0d, 0xa2, 0x13, 0x17, 0xe4, 0x3e, 0xc4, 0xb6, 0x2b, 0xa8, 0xc8, 0x62,
aa8173
--- openssl-1.0.1c/crypto/fips/fips_rand.c.orig	2012-11-03 20:07:49.956891942 +0100
aa8173
+++ openssl-1.0.1c/crypto/fips/fips_rand.c	2012-11-03 20:08:14.260048118 +0100
aa8173
@@ -47,6 +47,8 @@
aa8173
  *
aa8173
  */
aa8173
 
aa8173
+#ifdef OPENSSL_FIPS
aa8173
+
aa8173
 /*
aa8173
  * This is a FIPS approved AES PRNG based on ANSI X9.31 A.2.4.
aa8173
  */
aa8173
@@ -82,8 +84,6 @@
aa8173
 #include <openssl/fips.h>
aa8173
 #include "fips_locl.h"
aa8173
 
aa8173
-#ifdef OPENSSL_FIPS
aa8173
-
aa8173
 void *OPENSSL_stderr(void);
aa8173
 
aa8173
 # define AES_BLOCK_LENGTH        16
aa8173
--- openssl-1.0.1c/crypto/rand/md_rand.c.orig	2012-11-03 20:19:31.461754618 +0100
aa8173
+++ openssl-1.0.1c/crypto/rand/md_rand.c	2012-11-03 20:20:58.294282662 +0100
aa8173
@@ -394,7 +394,11 @@
aa8173
     /* always poll for external entropy in FIPS mode, drbg provides the 
aa8173
      * expansion
aa8173
      */
aa8173
+#ifdef OPENSSL_FIPS
aa8173
     if (!initialized || FIPS_module_mode()) {
aa8173
+#else
aa8173
+    if (!initialized) {
aa8173
+#endif
aa8173
         RAND_poll();
aa8173
         initialized = 1;
aa8173
     }
aa8173
--- openssl-1.0.1c/crypto/opensslconf.h.in	2012-11-09 20:34:03.434391630 +0100
aa8173
+++ openssl-1.0.1c/crypto/opensslconf.h.in.fips	2005-12-16 11:37:23.000000000 +0100
aa8173
@@ -1,20 +1,5 @@
aa8173
 /* crypto/opensslconf.h.in */
aa8173
 
aa8173
-#ifdef OPENSSL_DOING_MAKEDEPEND
aa8173
-
aa8173
-/* Include any symbols here that have to be explicitly set to enable a feature
aa8173
- * that should be visible to makedepend.
aa8173
- *
aa8173
- * [Our "make depend" doesn't actually look at this, we use actual build settings
aa8173
- * instead; we want to make it easy to remove subdirectories with disabled algorithms.]
aa8173
- */
aa8173
-
aa8173
-#ifndef OPENSSL_FIPS
aa8173
-#define OPENSSL_FIPS
aa8173
-#endif
aa8173
-
aa8173
-#endif
aa8173
-
aa8173
 /* Generate 80386 code? */
aa8173
 #undef I386_ONLY
aa8173