Add selftest check to SHA1 routine.

diff --git a/crypto/sha/sha_locl.h b/crypto/sha/sha_locl.h
index d65de44af0f431e6cdcd952431200ad8f4e8d30c..3b1cea84e448f27bc7e904b16e9e87d0d18b369e 100644 (file)
--- a/crypto/sha/sha_locl.h
+++ b/crypto/sha/sha_locl.h
@@ -151,6 +151,9 @@ FIPS_NON_FIPS_MD_Init(SHA)
 int HASH_INIT (SHA_CTX *c)
 #endif
        {
+#if defined(SHA_1) && defined(OPENSSL_FIPS)
+       FIPS_selftest_check();
+#endif
        c->h0=INIT_DATA_h0;
        c->h1=INIT_DATA_h1;
        c->h2=INIT_DATA_h2;

diff --git a/fips-1.0/sha/fips_standalone_sha1.c b/fips-1.0/sha/fips_standalone_sha1.c
index aba7acc610e1c11aa67594a0405585b065d8b79f..f18eaf0c90f87912f7854963d7f2e9fe43724990 100644 (file)
--- a/fips-1.0/sha/fips_standalone_sha1.c
+++ b/fips-1.0/sha/fips_standalone_sha1.c
@@ -55,6 +55,7 @@
 #include <openssl/hmac.h>
 
 int FIPS_selftest_failed() { return 0; }
+void FIPS_selftest_check() {}
 void OPENSSL_cleanse(void *p,size_t len) {}
 
 #ifdef OPENSSL_FIPS