Revert "version skew" patches that break FIPS compilation
authorDr. Stephen Henson <steve@openssl.org>
Sat, 9 Jun 2012 23:36:38 +0000 (23:36 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Sat, 9 Jun 2012 23:36:38 +0000 (23:36 +0000)
crypto/aes/aes_misc.c
crypto/camellia/cmll_misc.c
crypto/cast/c_skey.c
crypto/idea/i_skey.c
crypto/rand/rand_lib.c
crypto/rc2/rc2_skey.c
crypto/seed/seed.c

index 6c181ca..f083488 100644 (file)
@@ -50,6 +50,7 @@
  */
 
 #include <openssl/opensslv.h>
+#include <openssl/crypto.h>
 #include <openssl/aes.h>
 #include "aes_locl.h"
 
index 614b43b..f44d485 100644 (file)
@@ -50,6 +50,7 @@
  */
  
 #include <openssl/opensslv.h>
+#include <openssl/crypto.h>
 #include <openssl/camellia.h>
 #include "cmll_locl.h"
 
index 3c18774..cb6bf9f 100644 (file)
@@ -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"
index 2debbc1..afb8309 100644 (file)
@@ -56,6 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/crypto.h>
 #include <openssl/idea.h>
 #include "idea_lcl.h"
 
index 89c8a38..daf1dab 100644 (file)
@@ -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
index 065b2fd..6668ac0 100644 (file)
@@ -56,6 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/crypto.h>
 #include <openssl/rc2.h>
 #include "rc2_locl.h"
 
index 6e1a6b9..3e675a8 100644 (file)
@@ -32,6 +32,7 @@
 #include <memory.h>
 #endif
 
+#include <openssl/crypto.h>
 #include <openssl/seed.h>
 #include "seed_locl.h"