Commit 06843f82 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fake CPU caps so fips_standalone_sha1 compiles. 

Initialise update function for bad digest inits.
parent 1b2047c5

fips/sha/fips_standalone_sha1.c

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
int FIPS_selftest_failed() { return 0; }

void FIPS_selftest_check() {}

void OPENSSL_cleanse(void *p,size_t len) {}

unsigned int  OPENSSL_ia32cap_P[2];

#endif



#ifdef OPENSSL_FIPS

fips/utl/fips_md.c

+2 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ int FIPS_digestinit(EVP_MD_CTX *ctx, const EVP_MD *type) 
		{

		FIPSerr(FIPS_F_FIPS_DIGESTINIT,FIPS_R_FIPS_SELFTEST_FAILED);

		ctx->digest = &bad_md;

		ctx->update = bad_update;

		return 0;

		}

	if(FIPS_module_mode() && !(type->flags & EVP_MD_FLAG_FIPS) &&
@@ -178,6 +179,7 @@ int FIPS_digestinit(EVP_MD_CTX *ctx, const EVP_MD *type) 
		{

		EVPerr(EVP_F_FIPS_DIGESTINIT, EVP_R_DISABLED_FOR_FIPS);

		ctx->digest = &bad_md;

		ctx->update = bad_update;

		return 0;

		}

	if (ctx->digest != type)