aboutsummaryrefslogtreecommitdiff
path: root/fips/fips.h
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-01-27 17:23:43 +0000
committerDr. Stephen Henson <steve@openssl.org>2011-01-27 17:23:43 +0000
commit7cc684f4f7fbcdc5cf4683eaf025d4f915acbf3c (patch)
tree239b582a272e88cb8a3a8e9fad8806380128a2ed /fips/fips.h
parente36d6b8f7985739a493da0932bd08c9787c84dfc (diff)
downloadopenssl-7cc684f4f7fbcdc5cf4683eaf025d4f915acbf3c.zip
openssl-7cc684f4f7fbcdc5cf4683eaf025d4f915acbf3c.tar.gz
openssl-7cc684f4f7fbcdc5cf4683eaf025d4f915acbf3c.tar.bz2
Redirect FIPS memory allocation to FIPS_malloc() routine, remove
OpenSSL malloc dependencies.
Diffstat (limited to 'fips/fips.h')
-rw-r--r--fips/fips.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/fips/fips.h b/fips/fips.h
index 2ef955a..5452db9 100644
--- a/fips/fips.h
+++ b/fips/fips.h
@@ -113,8 +113,13 @@ 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 */