Commit 7175dbae authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Revert "version skew" patches that break FIPS compilation.

parent af454b5b

crypto/aes/aes_misc.c

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
 */



#include <openssl/opensslv.h>

#include <openssl/crypto.h>

#include <openssl/aes.h>

#include "aes_locl.h"

crypto/camellia/cmll_misc.c

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
 */

 

#include <openssl/opensslv.h>

#include <openssl/crypto.h>

#include <openssl/camellia.h>

#include "cmll_locl.h"

crypto/cast/c_skey.c

+1 −0
Original line number Diff line number Diff line
@@ -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"

crypto/idea/i_skey.c

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
 * [including the GNU Public Licence.]

 */



#include <openssl/crypto.h>

#include <openssl/idea.h>

#include "idea_lcl.h"

crypto/rand/rand_lib.c

+4 −2
Original line number Diff line number Diff line
@@ -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