Redirect FIPS memory allocation to FIPS_malloc() routine, remove

[openssl.git] / fips / fips.h

diff --git a/fips/fips.h b/fips/fips.h
index 6bc69c660d999499552b61d71bd699716216c203..5452db9311f522ec110e257ba18be66b7ba722ea 100644 (file)
--- a/fips/fips.h
+++ b/fips/fips.h
@@ -108,26 +108,18 @@ 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);
-
-#ifdef OPENSSL_FIPS_SOURCE
-#define ENGINE_init FIPS_engine_init
-#define ENGINE_finish FIPS_engine_finish
-#define ENGINE_get_digest FIPS_engine_get_digest
-#define ENGINE_get_digest_engine FIPS_engine_get_digest_engine
-#define ENGINE_get_RAND FIPS_engine_get_rand
-#define ENGINE_get_default_RAND FIPS_engine_get_default_rand
-#define EVP_SignFinal FIPS_evp_signfinal
-#define EVP_VerifyFinal FIPS_evp_verifyfinal
+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));
+
+void *FIPS_malloc(int num, const char *file, int line);
+void FIPS_free(void *);
+
+#if defined(OPENSSL_FIPSCANISTER) && defined(OPENSSL_FIPSAPI)
+#define CRYPTO_lock FIPS_lock
+#define CRYPTO_malloc FIPS_malloc
+#define CRYPTO_free FIPS_free
 #endif
 
 /* BEGIN ERROR CODES */