diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-01-27 17:23:43 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-01-27 17:23:43 +0000 |
| commit | 7cc684f4f7fbcdc5cf4683eaf025d4f915acbf3c (patch) | |
| tree | 239b582a272e88cb8a3a8e9fad8806380128a2ed /fips/utl | |
| parent | e36d6b8f7985739a493da0932bd08c9787c84dfc (diff) | |
Redirect FIPS memory allocation to FIPS_malloc() routine, remove
OpenSSL malloc dependencies.
Diffstat (limited to 'fips/utl')
| -rw-r--r-- | fips/utl/Makefile | 4 | ||||
| -rw-r--r-- | fips/utl/fips_enc.c | 4 | ||||
| -rw-r--r-- | fips/utl/fips_md.c | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/fips/utl/Makefile b/fips/utl/Makefile index 577578ee70..8542b32156 100644 --- a/fips/utl/Makefile +++ b/fips/utl/Makefile @@ -22,8 +22,8 @@ TEST= APPS= LIB=$(TOP)/libcrypto.a -LIBSRC= fips_err.c fips_md.c fips_enc.c fips_lck.c -LIBOBJ= fips_err.o fips_md.o fips_enc.o fips_lck.o +LIBSRC= fips_err.c fips_md.c fips_enc.c fips_lck.c fips_mem.c +LIBOBJ= fips_err.o fips_md.o fips_enc.o fips_lck.o fips_mem.o SRC= $(LIBSRC) diff --git a/fips/utl/fips_enc.c b/fips/utl/fips_enc.c index 23ba5ddb74..93647a023b 100644 --- a/fips/utl/fips_enc.c +++ b/fips/utl/fips_enc.c @@ -56,11 +56,13 @@ * [including the GNU Public Licence.] */ +#define OPENSSL_FIPSAPI + #include <stdio.h> #include <string.h> #include <openssl/evp.h> #include <openssl/err.h> -#include <openssl/rand.h> +#include <openssl/fips.h> void FIPS_cipher_ctx_init(EVP_CIPHER_CTX *ctx) { diff --git a/fips/utl/fips_md.c b/fips/utl/fips_md.c index 6e33e841a5..0038646f58 100644 --- a/fips/utl/fips_md.c +++ b/fips/utl/fips_md.c @@ -111,11 +111,14 @@ /* Minimal standalone FIPS versions of Digest operations */ +#define OPENSSL_FIPSAPI + #include <stdio.h> #include <string.h> #include <openssl/objects.h> #include <openssl/evp.h> #include <openssl/err.h> +#include <openssl/fips.h> void FIPS_md_ctx_init(EVP_MD_CTX *ctx) { |