aboutsummaryrefslogtreecommitdiff
path: root/fips/fips.h
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-01-27 14:29:48 +0000
committerDr. Stephen Henson <steve@openssl.org>2011-01-27 14:29:48 +0000
commit6ff9c48811cee25afccb8f181a398563a1b3a360 (patch)
treec61cc44ebe5e62209f51c94f20191f499bc3bdcf /fips/fips.h
parentad6019d6c0d22f384838b2f9ca339bdabed331a5 (diff)
downloadopenssl-6ff9c48811cee25afccb8f181a398563a1b3a360.zip
openssl-6ff9c48811cee25afccb8f181a398563a1b3a360.tar.gz
openssl-6ff9c48811cee25afccb8f181a398563a1b3a360.tar.bz2
New FIPS_lock() function for minimal FIPS locking API: to avoid dependencies
on OpenSSL locking code. Use API in some internal FIPS files. Remove redundant ENGINE defines from fips.h
Diffstat (limited to 'fips/fips.h')
-rw-r--r--fips/fips.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/fips/fips.h b/fips/fips.h
index 6bc69c6..061ed93 100644
--- a/fips/fips.h
+++ b/fips/fips.h
@@ -119,16 +119,8 @@ int FIPS_evp_digest(const void *data, size_t count,
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
-#endif
+void FIPS_set_locking_callback (void (*func)(int mode, int type,
+ const char *file,int line));
/* BEGIN ERROR CODES */
/* The following lines are auto generated by the script mkerr.pl. Any changes