From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 9 Jun 2012 23:36:38 +0000 (+0000)
Subject: Revert "version skew" patches that break FIPS compilation
X-Git-Tag: OpenSSL_1_0_2-beta1~613
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ff1c55e9833e8bebb05240fafed19c71ffdcc4ce;p=oweals%2Fopenssl.git

Revert "version skew" patches that break FIPS compilation
---

diff --git a/crypto/aes/aes_misc.c b/crypto/aes/aes_misc.c
index 6c181cae8d..f083488ecb 100644
--- a/crypto/aes/aes_misc.c
+++ b/crypto/aes/aes_misc.c
@@ -50,6 +50,7 @@
  */
 
 #include <openssl/opensslv.h>
+#include <openssl/crypto.h>
 #include <openssl/aes.h>
 #include "aes_locl.h"
 
diff --git a/crypto/camellia/cmll_misc.c b/crypto/camellia/cmll_misc.c
index 614b43b0b3..f44d48564c 100644
--- a/crypto/camellia/cmll_misc.c
+++ b/crypto/camellia/cmll_misc.c
@@ -50,6 +50,7 @@
  */
  
 #include <openssl/opensslv.h>
+#include <openssl/crypto.h>
 #include <openssl/camellia.h>
 #include "cmll_locl.h"
 
diff --git a/crypto/cast/c_skey.c b/crypto/cast/c_skey.c
index 3c18774447..cb6bf9fee3 100644
--- a/crypto/cast/c_skey.c
+++ b/crypto/cast/c_skey.c
@@ -56,6 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/crypto.h>
 #include <openssl/cast.h>
 #include "cast_lcl.h"
 #include "cast_s.h"
diff --git a/crypto/idea/i_skey.c b/crypto/idea/i_skey.c
index 2debbc1233..afb830964d 100644
--- a/crypto/idea/i_skey.c
+++ b/crypto/idea/i_skey.c
@@ -56,6 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/crypto.h>
 #include <openssl/idea.h>
 #include "idea_lcl.h"
 
diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
index 89c8a38146..daf1dab973 100644
--- a/crypto/rand/rand_lib.c
+++ b/crypto/rand/rand_lib.c
@@ -235,12 +235,14 @@ static size_t drbg_get_adin(DRBG_CTX *ctx, unsigned char **pout)
 static int drbg_rand_add(DRBG_CTX *ctx, const void *in, int inlen,
 				double entropy)
 	{
-	return RAND_SSLeay()->add(in, inlen, entropy);
+	RAND_SSLeay()->add(in, inlen, entropy);
+	return 1;
 	}
 
 static int drbg_rand_seed(DRBG_CTX *ctx, const void *in, int inlen)
 	{
-	return RAND_SSLeay()->seed(in, inlen);
+	RAND_SSLeay()->seed(in, inlen);
+	return 1;
 	}
 
 #ifndef OPENSSL_DRBG_DEFAULT_TYPE
diff --git a/crypto/rc2/rc2_skey.c b/crypto/rc2/rc2_skey.c
index 065b2fd16e..6668ac011f 100644
--- a/crypto/rc2/rc2_skey.c
+++ b/crypto/rc2/rc2_skey.c
@@ -56,6 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/crypto.h>
 #include <openssl/rc2.h>
 #include "rc2_locl.h"
 
diff --git a/crypto/seed/seed.c b/crypto/seed/seed.c
index 6e1a6b9c70..3e675a8d75 100644
--- a/crypto/seed/seed.c
+++ b/crypto/seed/seed.c
@@ -32,6 +32,7 @@
 #include <memory.h>
 #endif
 
+#include <openssl/crypto.h>
 #include <openssl/seed.h>
 #include "seed_locl.h"