Change library to use intrinsic memory allocation functions instead of

OPENSSL_foo wrappers. This changes:
OPENSSL_malloc->malloc
OPENSSL_free->free
OPENSSL_relloc->realloc
OPENSSL_freeFunc->free

3 files changed, 12 insertions, 12 deletions

diff --git a/src/lib/libcrypto/dh/dh_ameth.c b/src/lib/libcrypto/dh/dh_ameth.c
index 02ec2d47b4..d39f4b373d 100644
--- a/src/lib/libcrypto/dh/dh_ameth.c
+++ b/src/lib/libcrypto/dh/dh_ameth.c
@@ -168,7 +168,7 @@ static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
 
         err:
         if (penc)
-                OPENSSL_free(penc);
+                free(penc);
         if (pval)
                 ASN1_STRING_free(pval);
 
@@ -277,7 +277,7 @@ static int dh_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
 
 err:
         if (dp != NULL)
-                OPENSSL_free(dp);
+                free(dp);
         if (params != NULL)
                 ASN1_STRING_free(params);
         if (prkey != NULL)
@@ -353,7 +353,7 @@ static int do_dh_print(BIO *bp, const DH *x, int indent,
         else
                 ktype = "PKCS#3 DH Parameters";
 
-        m= OPENSSL_malloc(buf_len+10);
+        m= malloc(buf_len+10);
         if (m == NULL)
                 {
                 reason=ERR_R_MALLOC_FAILURE;
@@ -384,7 +384,7 @@ static int do_dh_print(BIO *bp, const DH *x, int indent,
 err:
                 DHerr(DH_F_DO_DH_PRINT,reason);
                 }
-        if (m != NULL) OPENSSL_free(m);
+        if (m != NULL) free(m);
         return(ret);
         }
 
diff --git a/src/lib/libcrypto/dh/dh_lib.c b/src/lib/libcrypto/dh/dh_lib.c
index a40caaf75b..4e3d25b7e5 100644
--- a/src/lib/libcrypto/dh/dh_lib.c
+++ b/src/lib/libcrypto/dh/dh_lib.c
@@ -110,7 +110,7 @@ DH *DH_new_method(ENGINE *engine)
         {
         DH *ret;
 
-        ret=(DH *)OPENSSL_malloc(sizeof(DH));
+        ret=(DH *)malloc(sizeof(DH));
         if (ret == NULL)
                 {
                 DHerr(DH_F_DH_NEW_METHOD,ERR_R_MALLOC_FAILURE);
@@ -124,7 +124,7 @@ DH *DH_new_method(ENGINE *engine)
                 if (!ENGINE_init(engine))
                         {
                         DHerr(DH_F_DH_NEW_METHOD, ERR_R_ENGINE_LIB);
-                        OPENSSL_free(ret);
+                        free(ret);
                         return NULL;
                         }
                 ret->engine = engine;
@@ -138,7 +138,7 @@ DH *DH_new_method(ENGINE *engine)
                         {
                         DHerr(DH_F_DH_NEW_METHOD,ERR_R_ENGINE_LIB);
                         ENGINE_finish(ret->engine);
-                        OPENSSL_free(ret);
+                        free(ret);
                         return NULL;
                         }
                 }
@@ -167,7 +167,7 @@ DH *DH_new_method(ENGINE *engine)
                         ENGINE_finish(ret->engine);
 #endif
                 CRYPTO_free_ex_data(CRYPTO_EX_INDEX_DH, ret, &ret->ex_data);
-                OPENSSL_free(ret);
+                free(ret);
                 ret=NULL;
                 }
         return(ret);
@@ -203,11 +203,11 @@ void DH_free(DH *r)
         if (r->g != NULL) BN_clear_free(r->g);
         if (r->q != NULL) BN_clear_free(r->q);
         if (r->j != NULL) BN_clear_free(r->j);
-        if (r->seed) OPENSSL_free(r->seed);
+        if (r->seed) free(r->seed);
         if (r->counter != NULL) BN_clear_free(r->counter);
         if (r->pub_key != NULL) BN_clear_free(r->pub_key);
         if (r->priv_key != NULL) BN_clear_free(r->priv_key);
-        OPENSSL_free(r);
+        free(r);
         }
 
 int DH_up_ref(DH *r)
diff --git a/src/lib/libcrypto/dh/dh_pmeth.c b/src/lib/libcrypto/dh/dh_pmeth.c
index 5ae72b7d4c..ec4553c0a8 100644
--- a/src/lib/libcrypto/dh/dh_pmeth.c
+++ b/src/lib/libcrypto/dh/dh_pmeth.c
@@ -80,7 +80,7 @@ typedef struct
 static int pkey_dh_init(EVP_PKEY_CTX *ctx)
         {
         DH_PKEY_CTX *dctx;
-        dctx = OPENSSL_malloc(sizeof(DH_PKEY_CTX));
+        dctx = malloc(sizeof(DH_PKEY_CTX));
         if (!dctx)
                 return 0;
         dctx->prime_len = 1024;
@@ -111,7 +111,7 @@ static void pkey_dh_cleanup(EVP_PKEY_CTX *ctx)
         {
         DH_PKEY_CTX *dctx = ctx->data;
         if (dctx)
-                OPENSSL_free(dctx);
+                free(dctx);
         }
 
 static int pkey_dh_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)