Revert "version skew" patches that break FIPS compilation

diff --git a/crypto/aes/aes_misc.c b/crypto/aes/aes_misc.c
index 6c181cae8d37fb76197a75c968341b7a0ee1226c..f083488ecb34aa842c7e8637945df1bf4fa72192 100644 (file)
--- 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 614b43b0b3f24afc2ca132d4726470fe452a6751..f44d48564c2a28a2efd9c84857e73ca0574c60c7 100644 (file)
--- 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 3c187744473b257d8d8e7d9258864c6bc6ccfe7d..cb6bf9fee37fa16f8bf7e1258ccd001f5b3a12dd 100644 (file)
--- 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 2debbc12336bd73f52f5fea6e1079fcfe2d7d6ab..afb830964df305ab31d6520cc01add13d7df68fd 100644 (file)
--- 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 89c8a38146605feacefd163b607e7d0fc358e72c..daf1dab9739590e409d7044aafd9e08c210accd2 100644 (file)
--- 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 065b2fd16e9ddd76a8bea1f1c5afb7bbe9c274dc..6668ac011f0d1291c8106b343142e455a42dcb97 100644 (file)
--- 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 6e1a6b9c702f70d44ca78134ee3b2fe0a4702a5a..3e675a8d75515206c89e115f376d674e08a05ca6 100644 (file)
--- 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"