openssl-engine-0.9.6 merge

3 files changed, 23 insertions, 20 deletions

diff --git a/src/lib/libcrypto/txt_db/Makefile.ssl b/src/lib/libcrypto/txt_db/Makefile.ssl
index a631dce6f2..cb54d53323 100644
--- a/src/lib/libcrypto/txt_db/Makefile.ssl
+++ b/src/lib/libcrypto/txt_db/Makefile.ssl
@@ -83,5 +83,5 @@ txt_db.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
 txt_db.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 txt_db.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 txt_db.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-txt_db.o: ../../include/openssl/stack.h ../../include/openssl/txt_db.h
-txt_db.o: ../cryptlib.h
+txt_db.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+txt_db.o: ../../include/openssl/txt_db.h ../cryptlib.h
diff --git a/src/lib/libcrypto/txt_db/txt_db.c b/src/lib/libcrypto/txt_db/txt_db.c
index 33acc81f3f..3b04fe280c 100644
--- a/src/lib/libcrypto/txt_db/txt_db.c
+++ b/src/lib/libcrypto/txt_db/txt_db.c
@@ -83,16 +83,16 @@ TXT_DB *TXT_DB_read(BIO *in, int num)
         if ((buf=BUF_MEM_new()) == NULL) goto err;
         if (!BUF_MEM_grow(buf,size)) goto err;
 
-        if ((ret=(TXT_DB *)Malloc(sizeof(TXT_DB))) == NULL)
+        if ((ret=(TXT_DB *)OPENSSL_malloc(sizeof(TXT_DB))) == NULL)
                 goto err;
         ret->num_fields=num;
         ret->index=NULL;
         ret->qual=NULL;
         if ((ret->data=sk_new_null()) == NULL)
                 goto err;
-        if ((ret->index=(LHASH **)Malloc(sizeof(LHASH *)*num)) == NULL)
+        if ((ret->index=(LHASH **)OPENSSL_malloc(sizeof(LHASH *)*num)) == NULL)
                 goto err;
-        if ((ret->qual=(int (**)())Malloc(sizeof(int (**)())*num)) == NULL)
+        if ((ret->qual=(int (**)())OPENSSL_malloc(sizeof(int (**)())*num)) == NULL)
                 goto err;
         for (i=0; i<num; i++)
                 {
@@ -122,7 +122,7 @@ TXT_DB *TXT_DB_read(BIO *in, int num)
                 else
                         {
                         buf->data[offset-1]='\0'; /* blat the '\n' */
-                        p=(char *)Malloc(add+offset);
+                        p=(char *)OPENSSL_malloc(add+offset);
                         offset=0;
                         }
                 pp=(char **)p;
@@ -177,12 +177,12 @@ err:
         if (er)
                 {
 #if !defined(NO_STDIO) && !defined(WIN16)
-                if (er == 1) fprintf(stderr,"Malloc failure\n");
+                if (er == 1) fprintf(stderr,"OPENSSL_malloc failure\n");
 #endif
                 if (ret->data != NULL) sk_free(ret->data);
-                if (ret->index != NULL) Free(ret->index);
-                if (ret->qual != NULL) Free(ret->qual);
-                if (ret != NULL) Free(ret);
+                if (ret->index != NULL) OPENSSL_free(ret->index);
+                if (ret->qual != NULL) OPENSSL_free(ret->qual);
+                if (ret != NULL) OPENSSL_free(ret);
                 return(NULL);
                 }
         else
@@ -349,10 +349,10 @@ void TXT_DB_free(TXT_DB *db)
                 {
                 for (i=db->num_fields-1; i>=0; i--)
                         if (db->index[i] != NULL) lh_free(db->index[i]);
-                Free(db->index);
+                OPENSSL_free(db->index);
                 }
         if (db->qual != NULL)
-                Free(db->qual);
+                OPENSSL_free(db->qual);
         if (db->data != NULL)
                 {
                 for (i=sk_num(db->data)-1; i>=0; i--)
@@ -364,7 +364,7 @@ void TXT_DB_free(TXT_DB *db)
                         if (max == NULL) /* new row */
                                 {
                                 for (n=0; n<db->num_fields; n++)
-                                        if (p[n] != NULL) Free(p[n]);
+                                        if (p[n] != NULL) OPENSSL_free(p[n]);
                                 }
                         else
                                 {
@@ -372,12 +372,12 @@ void TXT_DB_free(TXT_DB *db)
                                         {
                                         if (((p[n] < (char *)p) || (p[n] > max))
                                                 && (p[n] != NULL))
-                                                Free(p[n]);
+                                                OPENSSL_free(p[n]);
                                         }
                                 }
-                        Free(sk_value(db->data,i));
+                        OPENSSL_free(sk_value(db->data,i));
                         }
                 sk_free(db->data);
                 }
-        Free(db);
+        OPENSSL_free(db);
         }
diff --git a/src/lib/libcrypto/txt_db/txt_db.h b/src/lib/libcrypto/txt_db/txt_db.h
index 58b9de1353..342533d40d 100644
--- a/src/lib/libcrypto/txt_db/txt_db.h
+++ b/src/lib/libcrypto/txt_db/txt_db.h
@@ -59,10 +59,9 @@
 #ifndef HEADER_TXT_DB_H
 #define HEADER_TXT_DB_H
 
-#ifdef  __cplusplus
-extern "C" {
+#ifndef NO_BIO
+#include <openssl/bio.h>
 #endif
-
 #include <openssl/stack.h>
 #include <openssl/lhash.h>
 
@@ -73,6 +72,10 @@ extern "C" {
 #define DB_ERROR_NO_INDEX               4
 #define DB_ERROR_INSERT_INDEX_CLASH     5
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 typedef struct txt_db_st
         {
         int num_fields;
@@ -85,7 +88,7 @@ typedef struct txt_db_st
         char **arg_row;
         } TXT_DB;
 
-#ifdef HEADER_BIO_H
+#ifndef NO_BIO
 TXT_DB *TXT_DB_read(BIO *in, int num);
 long TXT_DB_write(BIO *out, TXT_DB *db);
 #else