generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fake CPU caps so fips_standalone_sha1 compiles.

Browse Source 
Initialise update function for bad digest inits.
This commit is contained in:
Dr. Stephen Henson 2011-05-31 16:22:21 +00:00
parent 1b2047c5c0
commit 06843f826f
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fips/sha/fips_standalone_sha1.c
View File

@ -59,6 +59,7 @@
int FIPS_selftest_failed() { return 0; } int FIPS_selftest_failed() { return 0; }
void FIPS_selftest_check() {} void FIPS_selftest_check() {}
void OPENSSL_cleanse(void *p,size_t len) {} void OPENSSL_cleanse(void *p,size_t len) {}
unsigned int OPENSSL_ia32cap_P[2];
#endif #endif
#ifdef OPENSSL_FIPS #ifdef OPENSSL_FIPS

2
fips/utl/fips_md.c
View File

@ -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); FIPSerr(FIPS_F_FIPS_DIGESTINIT,FIPS_R_FIPS_SELFTEST_FAILED);
ctx->digest = &bad_md; ctx->digest = &bad_md;
ctx->update = bad_update;
return 0; return 0;
} }
if(FIPS_module_mode() && !(type->flags & EVP_MD_FLAG_FIPS) && 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); EVPerr(EVP_F_FIPS_DIGESTINIT, EVP_R_DISABLED_FOR_FIPS);
ctx->digest = &bad_md; ctx->digest = &bad_md;
ctx->update = bad_update;
return 0; return 0;
} }
if (ctx->digest != type) if (ctx->digest != type)