2 files changed, 14 insertions, 9 deletions

diff --git a/src/lib/libcrypto/buffer/Makefile.ssl b/src/lib/libcrypto/buffer/Makefile.ssl
index 506708c37f..f473d1ab4b 100644
--- a/src/lib/libcrypto/buffer/Makefile.ssl
+++ b/src/lib/libcrypto/buffer/Makefile.ssl
@@ -78,10 +78,15 @@ clean:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-buf_err.o: ../../include/openssl/buffer.h ../../include/openssl/err.h
+buf_err.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+buf_err.o: ../../include/openssl/crypto.h ../../include/openssl/err.h
+buf_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslv.h
+buf_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+buf_err.o: ../../include/openssl/symhacks.h
 buffer.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 buffer.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
 buffer.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-buffer.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-buffer.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+buffer.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+buffer.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+buffer.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 buffer.o: ../cryptlib.h
diff --git a/src/lib/libcrypto/buffer/buffer.c b/src/lib/libcrypto/buffer/buffer.c
index c3a108ea52..b76ff3ad7a 100644
--- a/src/lib/libcrypto/buffer/buffer.c
+++ b/src/lib/libcrypto/buffer/buffer.c
@@ -64,7 +64,7 @@ BUF_MEM *BUF_MEM_new(void)
         {
         BUF_MEM *ret;
 
-        ret=Malloc(sizeof(BUF_MEM));
+        ret=OPENSSL_malloc(sizeof(BUF_MEM));
         if (ret == NULL)
                 {
                 BUFerr(BUF_F_BUF_MEM_NEW,ERR_R_MALLOC_FAILURE);
@@ -84,9 +84,9 @@ void BUF_MEM_free(BUF_MEM *a)
         if (a->data != NULL)
                 {
                 memset(a->data,0,(unsigned int)a->max);
-                Free(a->data);
+                OPENSSL_free(a->data);
                 }
-        Free(a);
+        OPENSSL_free(a);
         }
 
 int BUF_MEM_grow(BUF_MEM *str, int len)
@@ -107,9 +107,9 @@ int BUF_MEM_grow(BUF_MEM *str, int len)
                 }
         n=(len+3)/3*4;
         if (str->data == NULL)
-                ret=Malloc(n);
+                ret=OPENSSL_malloc(n);
         else
-                ret=Realloc(str->data,n);
+                ret=OPENSSL_realloc(str->data,n);
         if (ret == NULL)
                 {
                 BUFerr(BUF_F_BUF_MEM_GROW,ERR_R_MALLOC_FAILURE);
@@ -132,7 +132,7 @@ char *BUF_strdup(const char *str)
         if (str == NULL) return(NULL);
 
         n=strlen(str);
-        ret=Malloc(n+1);
+        ret=OPENSSL_malloc(n+1);
         if (ret == NULL) 
                 {
                 BUFerr(BUF_F_BUF_STRDUP,ERR_R_MALLOC_FAILURE);