Update source files to handle new FIPS_lock() location. Add FIPS_lock()

definition. Remove stale function references from fips.h

diff --git a/crypto/bn/bn_mont.c b/crypto/bn/bn_mont.c
index 2f7fb843a95d204d5e688d7b2252b93770da2f09..ba659cfd1d51719bcb7d53c0dbdbb182828f9c0e 100644 (file)
--- a/crypto/bn/bn_mont.c
+++ b/crypto/bn/bn_mont.c
@@ -122,6 +122,10 @@
 #include "cryptlib.h"
 #include "bn_lcl.h"
 
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
+
 #define MONT_WORD /* use the faster word-based algorithm */
 
 #ifdef MONT_WORD

diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c
index 87d4bfb75d88c202a64dd04bb7f67c8deb9dafe4..b17ad5203d80f994baa060dbff85de8d9c090a10 100644 (file)
--- a/crypto/rand/md_rand.c
+++ b/crypto/rand/md_rand.c
@@ -129,6 +129,10 @@
 #include <openssl/crypto.h>
 #include <openssl/err.h>
 
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
+
 #ifdef BN_DEBUG
 # define PREDICT
 #endif

diff --git a/fips/fips.h b/fips/fips.h
index 96d8ff64bba7f14d684bf7a0a3b7b49800a3d6b6..2ef955ab13f3d0b8bdaeed85fb6a7d3f659372e6 100644 (file)
--- a/fips/fips.h
+++ b/fips/fips.h
@@ -108,16 +108,7 @@ int fips_cipher_test(struct evp_cipher_ctx_st *ctx,
 void fips_set_selftest_fail(void);
 int fips_check_rsa(struct rsa_st *rsa);
 
-void FIPS_evp_md_ctx_init(EVP_MD_CTX *ctx);
-EVP_MD_CTX *FIPS_evp_md_ctx_create(void);
-int FIPS_evp_digestinit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl);
-int FIPS_evp_digestupdate(EVP_MD_CTX *ctx, const void *data, size_t count);
-int FIPS_evp_digestfinal(EVP_MD_CTX *ctx,
-                                       unsigned char *md, unsigned int *size);
-int FIPS_evp_digest(const void *data, size_t count,
-               unsigned char *md, unsigned int *size, const EVP_MD *type, ENGINE *impl);
-void FIPS_evp_md_ctx_destroy(EVP_MD_CTX *ctx);
-int FIPS_evp_md_ctx_cleanup(EVP_MD_CTX *ctx);
+void FIPS_lock(int mode, int type,const char *file,int line);
 
 void FIPS_set_locking_callback (void (*func)(int mode, int type,
                                const char *file,int line));