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, 15 insertions, 15 deletions

diff --git a/src/lib/libcrypto/ocsp/ocsp_ext.c b/src/lib/libcrypto/ocsp/ocsp_ext.c
index ec884cb08f..9c7832b301 100644
--- a/src/lib/libcrypto/ocsp/ocsp_ext.c
+++ b/src/lib/libcrypto/ocsp/ocsp_ext.c
@@ -274,7 +274,7 @@ ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, i2d_of_void *i2d,
         if (data)
                 {
                 if ((i=i2d(data,NULL)) <= 0) goto err;
-                if (!(b=p=OPENSSL_malloc((unsigned int)i)))
+                if (!(b=p=malloc((unsigned int)i)))
                         goto err;
                 if (i2d(data, &p) <= 0) goto err;
                 }
@@ -285,7 +285,7 @@ ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, i2d_of_void *i2d,
                                                    V_ASN1_SEQUENCE,
                                                    V_ASN1_UNIVERSAL,
                                                    IS_SEQUENCE))<=0) goto err;
-                if (!(b=p=OPENSSL_malloc((unsigned int)i)))
+                if (!(b=p=malloc((unsigned int)i)))
                         goto err;
                 if (i2d_ASN1_SET_OF_ASN1_OBJECT(sk,&p,(I2D_OF(ASN1_OBJECT))i2d,
                                                 V_ASN1_SEQUENCE,
@@ -299,10 +299,10 @@ ASN1_STRING *ASN1_STRING_encode(ASN1_STRING *s, i2d_of_void *i2d,
                 }
         if (!s && !(s = ASN1_STRING_new())) goto err;
         if (!(ASN1_STRING_set(s, b, i))) goto err;
-        OPENSSL_free(b);
+        free(b);
         return s;
 err:
-        if (b) OPENSSL_free(b);
+        if (b) free(b);
         return NULL;
         }
 #endif
@@ -327,7 +327,7 @@ static int ocsp_add1_nonce(STACK_OF(X509_EXTENSION) **exts, unsigned char *val,
          * it relies on library internals.
          */
         os.length = ASN1_object_size(0, len, V_ASN1_OCTET_STRING);
-        os.data = OPENSSL_malloc(os.length);
+        os.data = malloc(os.length);
         if (os.data == NULL)
                 goto err;
         tmpval = os.data;
@@ -342,7 +342,7 @@ static int ocsp_add1_nonce(STACK_OF(X509_EXTENSION) **exts, unsigned char *val,
         ret = 1;
         err:
         if (os.data)
-                OPENSSL_free(os.data);
+                free(os.data);
         return ret;
         }
 
diff --git a/src/lib/libcrypto/ocsp/ocsp_ht.c b/src/lib/libcrypto/ocsp/ocsp_ht.c
index af5fc16691..17b252d6a8 100644
--- a/src/lib/libcrypto/ocsp/ocsp_ht.c
+++ b/src/lib/libcrypto/ocsp/ocsp_ht.c
@@ -114,8 +114,8 @@ void OCSP_REQ_CTX_free(OCSP_REQ_CTX *rctx)
         if (rctx->mem)
                 BIO_free(rctx->mem);
         if (rctx->iobuf)
-                OPENSSL_free(rctx->iobuf);
-        OPENSSL_free(rctx);
+                free(rctx->iobuf);
+        free(rctx);
         }
 
 int OCSP_REQ_CTX_set1_req(OCSP_REQ_CTX *rctx, OCSP_REQUEST *req)
@@ -157,7 +157,7 @@ OCSP_REQ_CTX *OCSP_sendreq_new(BIO *io, char *path, OCSP_REQUEST *req,
         static const char post_hdr[] = "POST %s HTTP/1.0\r\n";
 
         OCSP_REQ_CTX *rctx;
-        rctx = OPENSSL_malloc(sizeof(OCSP_REQ_CTX));
+        rctx = malloc(sizeof(OCSP_REQ_CTX));
         rctx->state = OHS_ERROR;
         rctx->mem = BIO_new(BIO_s_mem());
         rctx->io = io;
@@ -166,7 +166,7 @@ OCSP_REQ_CTX *OCSP_sendreq_new(BIO *io, char *path, OCSP_REQUEST *req,
                 rctx->iobuflen = maxline;
         else
                 rctx->iobuflen = OCSP_MAX_LINE_LEN;
-        rctx->iobuf = OPENSSL_malloc(rctx->iobuflen);
+        rctx->iobuf = malloc(rctx->iobuflen);
         if (!rctx->iobuf)
                 return 0;
         if (!path)
diff --git a/src/lib/libcrypto/ocsp/ocsp_lib.c b/src/lib/libcrypto/ocsp/ocsp_lib.c
index a94dc838ee..514cdabf2d 100644
--- a/src/lib/libcrypto/ocsp/ocsp_lib.c
+++ b/src/lib/libcrypto/ocsp/ocsp_lib.c
@@ -242,7 +242,7 @@ int OCSP_parse_url(char *url, char **phost, char **pport, char **ppath, int *pss
 
         if (!*phost) goto mem_err;
 
-        OPENSSL_free(buf);
+        free(buf);
 
         return 1;
 
@@ -255,10 +255,10 @@ int OCSP_parse_url(char *url, char **phost, char **pport, char **ppath, int *pss
 
 
         err:
-        if (buf) OPENSSL_free(buf);
-        if (*ppath) OPENSSL_free(*ppath);
-        if (*pport) OPENSSL_free(*pport);
-        if (*phost) OPENSSL_free(*phost);
+        if (buf) free(buf);
+        if (*ppath) free(*ppath);
+        if (*pport) free(*pport);
+        if (*phost) free(*phost);
         return 0;
 
         }