7 files changed, 43 insertions, 43 deletions

diff --git a/src/lib/libcrypto/pem/pem_info.c b/src/lib/libcrypto/pem/pem_info.c
index cc7f24a9c1..4351260dfb 100644
--- a/src/lib/libcrypto/pem/pem_info.c
+++ b/src/lib/libcrypto/pem/pem_info.c
@@ -272,9 +272,9 @@ start:
                 else    {
                         /* unknown */
                         }
-                if (name != NULL) OPENSSL_free(name);
-                if (header != NULL) OPENSSL_free(header);
-                if (data != NULL) OPENSSL_free(data);
+                if (name != NULL) free(name);
+                if (header != NULL) free(header);
+                if (data != NULL) free(data);
                 name=NULL;
                 header=NULL;
                 data=NULL;
@@ -303,9 +303,9 @@ err:
                 ret=NULL;
                 }
                 
-        if (name != NULL) OPENSSL_free(name);
-        if (header != NULL) OPENSSL_free(header);
-        if (data != NULL) OPENSSL_free(data);
+        if (name != NULL) free(name);
+        if (header != NULL) free(header);
+        if (data != NULL) free(data);
         return(ret);
         }
 
diff --git a/src/lib/libcrypto/pem/pem_lib.c b/src/lib/libcrypto/pem/pem_lib.c
index 0dfa7c7376..aa6a4c9387 100644
--- a/src/lib/libcrypto/pem/pem_lib.c
+++ b/src/lib/libcrypto/pem/pem_lib.c
@@ -288,9 +288,9 @@ int PEM_bytes_read_bio(unsigned char **pdata, long *plen, char **pnm, const char
                         return 0;
                 }
                 if(check_pem(nm, name)) break;
-                OPENSSL_free(nm);
-                OPENSSL_free(header);
-                OPENSSL_free(data);
+                free(nm);
+                free(header);
+                free(data);
                 }
         if (!PEM_get_EVP_CIPHER_INFO(header,&cipher)) goto err;
         if (!PEM_do_header(&cipher,data,&len,cb,u)) goto err;
@@ -304,9 +304,9 @@ int PEM_bytes_read_bio(unsigned char **pdata, long *plen, char **pnm, const char
         ret = 1;
 
 err:
-        if (!ret || !pnm) OPENSSL_free(nm);
-        OPENSSL_free(header);
-        if (!ret) OPENSSL_free(data);
+        if (!ret || !pnm) free(nm);
+        free(header);
+        if (!ret) free(data);
         return ret;
         }
 
@@ -360,7 +360,7 @@ int PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, BIO *bp,
                 }
         /* dzise + 8 bytes are needed */
         /* actually it needs the cipher block size extra... */
-        data=(unsigned char *)OPENSSL_malloc((unsigned int)dsize+20);
+        data=(unsigned char *)malloc((unsigned int)dsize+20);
         if (data == NULL)
                 {
                 PEMerr(PEM_F_PEM_ASN1_WRITE_BIO,ERR_R_MALLOC_FAILURE);
@@ -427,7 +427,7 @@ err:
         if (data != NULL)
                 {
                 OPENSSL_cleanse(data,(unsigned int)dsize);
-                OPENSSL_free(data);
+                free(data);
                 }
         return(ret);
         }
@@ -599,7 +599,7 @@ int PEM_write_bio(BIO *bp, const char *name, char *header, unsigned char *data,
                         goto err;
                 }
 
-        buf = OPENSSL_malloc(PEM_BUFSIZE*8);
+        buf = malloc(PEM_BUFSIZE*8);
         if (buf == NULL)
                 {
                 reason=ERR_R_MALLOC_FAILURE;
@@ -620,7 +620,7 @@ int PEM_write_bio(BIO *bp, const char *name, char *header, unsigned char *data,
         EVP_EncodeFinal(&ctx,buf,&outl);
         if ((outl > 0) && (BIO_write(bp,(char *)buf,outl) != outl)) goto err;
         OPENSSL_cleanse(buf, PEM_BUFSIZE*8);
-        OPENSSL_free(buf);
+        free(buf);
         buf = NULL;
         if (    (BIO_write(bp,"-----END ",9) != 9) ||
                 (BIO_write(bp,name,nlen) != nlen) ||
@@ -630,7 +630,7 @@ int PEM_write_bio(BIO *bp, const char *name, char *header, unsigned char *data,
 err:
         if (buf) {
                 OPENSSL_cleanse(buf, PEM_BUFSIZE*8);
-                OPENSSL_free(buf);
+                free(buf);
         }
         PEMerr(PEM_F_PEM_WRITE_BIO,reason);
         return(0);
@@ -809,9 +809,9 @@ int PEM_read_bio(BIO *bp, char **name, char **header, unsigned char **data,
         *header=headerB->data;
         *data=(unsigned char *)dataB->data;
         *len=bl;
-        OPENSSL_free(nameB);
-        OPENSSL_free(headerB);
-        OPENSSL_free(dataB);
+        free(nameB);
+        free(headerB);
+        free(dataB);
         return(1);
 err:
         BUF_MEM_free(nameB);
diff --git a/src/lib/libcrypto/pem/pem_oth.c b/src/lib/libcrypto/pem/pem_oth.c
index b33868d25a..69d281aa9d 100644
--- a/src/lib/libcrypto/pem/pem_oth.c
+++ b/src/lib/libcrypto/pem/pem_oth.c
@@ -81,6 +81,6 @@ void *PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp, void **x,
         ret=d2i(x,&p,len);
         if (ret == NULL)
                 PEMerr(PEM_F_PEM_ASN1_READ_BIO,ERR_R_ASN1_LIB);
-        OPENSSL_free(data);
+        free(data);
         return(ret);
         }
diff --git a/src/lib/libcrypto/pem/pem_pkey.c b/src/lib/libcrypto/pem/pem_pkey.c
index ef152be264..a3b609b2f3 100644
--- a/src/lib/libcrypto/pem/pem_pkey.c
+++ b/src/lib/libcrypto/pem/pem_pkey.c
@@ -131,9 +131,9 @@ p8err:
         if (ret == NULL)
                 PEMerr(PEM_F_PEM_READ_BIO_PRIVATEKEY,ERR_R_ASN1_LIB);
 err:
-        OPENSSL_free(nm);
+        free(nm);
         OPENSSL_cleanse(data, len);
-        OPENSSL_free(data);
+        free(data);
         return(ret);
         }
 
@@ -188,8 +188,8 @@ EVP_PKEY *PEM_read_bio_Parameters(BIO *bp, EVP_PKEY **x)
 err:
         if (ret == NULL)
                 PEMerr(PEM_F_PEM_READ_BIO_PARAMETERS,ERR_R_ASN1_LIB);
-        OPENSSL_free(nm);
-        OPENSSL_free(data);
+        free(nm);
+        free(data);
         return(ret);
         }
 
diff --git a/src/lib/libcrypto/pem/pem_seal.c b/src/lib/libcrypto/pem/pem_seal.c
index b6b4e13498..bac7b16b44 100644
--- a/src/lib/libcrypto/pem/pem_seal.c
+++ b/src/lib/libcrypto/pem/pem_seal.c
@@ -86,7 +86,7 @@ int PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type, EVP_MD *md_type,
                 j=RSA_size(pubk[i]->pkey.rsa);
                 if (j > max) max=j;
                 }
-        s=(char *)OPENSSL_malloc(max*2);
+        s=(char *)malloc(max*2);
         if (s == NULL)
                 {
                 PEMerr(PEM_F_PEM_SEALINIT,ERR_R_MALLOC_FAILURE);
@@ -114,7 +114,7 @@ int PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type, EVP_MD *md_type,
 
         ret=npubk;
 err:
-        if (s != NULL) OPENSSL_free(s);
+        if (s != NULL) free(s);
         OPENSSL_cleanse(key,EVP_MAX_KEY_LENGTH);
         return(ret);
         }
@@ -157,7 +157,7 @@ int PEM_SealFinal(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *sig, int *sigl,
                 }
         i=RSA_size(priv->pkey.rsa);
         if (i < 100) i=100;
-        s=(unsigned char *)OPENSSL_malloc(i*2);
+        s=(unsigned char *)malloc(i*2);
         if (s == NULL)
                 {
                 PEMerr(PEM_F_PEM_SEALFINAL,ERR_R_MALLOC_FAILURE);
@@ -179,7 +179,7 @@ int PEM_SealFinal(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *sig, int *sigl,
 err:
         EVP_MD_CTX_cleanup(&ctx->md);
         EVP_CIPHER_CTX_cleanup(&ctx->cipher);
-        if (s != NULL) OPENSSL_free(s);
+        if (s != NULL) free(s);
         return(ret);
         }
 #else /* !OPENSSL_NO_RSA */
diff --git a/src/lib/libcrypto/pem/pem_sign.c b/src/lib/libcrypto/pem/pem_sign.c
index c3b9808cb2..cbd3cd0793 100644
--- a/src/lib/libcrypto/pem/pem_sign.c
+++ b/src/lib/libcrypto/pem/pem_sign.c
@@ -82,7 +82,7 @@ int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen,
         int i,ret=0;
         unsigned int m_len;
 
-        m=(unsigned char *)OPENSSL_malloc(EVP_PKEY_size(pkey)+2);
+        m=(unsigned char *)malloc(EVP_PKEY_size(pkey)+2);
         if (m == NULL)
                 {
                 PEMerr(PEM_F_PEM_SIGNFINAL,ERR_R_MALLOC_FAILURE);
@@ -96,7 +96,7 @@ int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen,
         ret=1;
 err:
         /* ctx has been zeroed by EVP_SignFinal() */
-        if (m != NULL) OPENSSL_free(m);
+        if (m != NULL) free(m);
         return(ret);
         }
 
diff --git a/src/lib/libcrypto/pem/pvkfmt.c b/src/lib/libcrypto/pem/pvkfmt.c
index b1bf71a5da..8da8e77973 100644
--- a/src/lib/libcrypto/pem/pvkfmt.c
+++ b/src/lib/libcrypto/pem/pvkfmt.c
@@ -93,14 +93,14 @@ static int read_lebn(const unsigned char **in, unsigned int nbyte, BIGNUM **r)
         unsigned char *tmpbuf, *q;
         unsigned int i;
         p = *in + nbyte - 1;
-        tmpbuf = OPENSSL_malloc(nbyte);
+        tmpbuf = malloc(nbyte);
         if (!tmpbuf)
                 return 0;
         q = tmpbuf;
         for (i = 0; i < nbyte; i++)
                 *q++ = *p--;
         *r = BN_bin2bn(tmpbuf, nbyte, NULL);
-        OPENSSL_free(tmpbuf);
+        free(tmpbuf);
         if (*r)
                 {
                 *in += nbyte;
@@ -284,7 +284,7 @@ static EVP_PKEY *do_b2i_bio(BIO *in, int ispub)
                 return NULL;
 
         length = blob_length(bitlen, isdss, ispub);
-        buf = OPENSSL_malloc(length);
+        buf = malloc(length);
         if (!buf)
                 {
                 PEMerr(PEM_F_DO_B2I_BIO, ERR_R_MALLOC_FAILURE);
@@ -304,7 +304,7 @@ static EVP_PKEY *do_b2i_bio(BIO *in, int ispub)
 
         err:
         if (buf)
-                OPENSSL_free(buf);
+                free(buf);
         return ret;
         }
 
@@ -508,7 +508,7 @@ static int do_i2b(unsigned char **out, EVP_PKEY *pk, int ispub)
                 p = *out;
         else
                 {
-                p = OPENSSL_malloc(outlen);
+                p = malloc(outlen);
                 if (!p)
                         return -1;
                 *out = p;
@@ -541,7 +541,7 @@ static int do_i2b_bio(BIO *out, EVP_PKEY *pk, int ispub)
         if (outlen < 0)
                 return -1;
         wrlen = BIO_write(out, tmp, outlen);
-        OPENSSL_free(tmp);
+        free(tmp);
         if (wrlen == outlen)
                 return outlen;
         return -1;
@@ -746,7 +746,7 @@ static EVP_PKEY *do_PVK_body(const unsigned char **in,
                         PEMerr(PEM_F_DO_PVK_BODY,PEM_R_BAD_PASSWORD_READ);
                         return NULL;
                         }
-                enctmp = OPENSSL_malloc(keylen + 8);
+                enctmp = malloc(keylen + 8);
                 if (!enctmp)
                         {
                         PEMerr(PEM_F_DO_PVK_BODY, ERR_R_MALLOC_FAILURE);
@@ -797,7 +797,7 @@ static EVP_PKEY *do_PVK_body(const unsigned char **in,
         err:
         EVP_CIPHER_CTX_cleanup(&cctx);
         if (enctmp && saltlen)
-                OPENSSL_free(enctmp);
+                free(enctmp);
         return ret;
         }
 
@@ -819,7 +819,7 @@ EVP_PKEY *b2i_PVK_bio(BIO *in, pem_password_cb *cb, void *u)
         if (!do_PVK_header(&p, 24, 0, &saltlen, &keylen))
                 return 0;
         buflen = (int) keylen + saltlen;
-        buf = OPENSSL_malloc(buflen);
+        buf = malloc(buflen);
         if (!buf)
                 {
                 PEMerr(PEM_F_B2I_PVK_BIO, ERR_R_MALLOC_FAILURE);
@@ -837,7 +837,7 @@ EVP_PKEY *b2i_PVK_bio(BIO *in, pem_password_cb *cb, void *u)
         if (buf)
                 {
                 OPENSSL_cleanse(buf, buflen);
-                OPENSSL_free(buf);
+                free(buf);
                 }
         return ret;
         }
@@ -863,7 +863,7 @@ static int i2b_PVK(unsigned char **out, EVP_PKEY*pk, int enclevel,
                 p = *out;
         else
                 {
-                p = OPENSSL_malloc(outlen);
+                p = malloc(outlen);
                 if (!p)
                         {
                         PEMerr(PEM_F_I2B_PVK,ERR_R_MALLOC_FAILURE);
@@ -936,7 +936,7 @@ int i2b_PVK_bio(BIO *out, EVP_PKEY *pk, int enclevel,
         if (outlen < 0)
                 return -1;
         wrlen = BIO_write(out, tmp, outlen);
-        OPENSSL_free(tmp);
+        free(tmp);
         if (wrlen == outlen)
                 {
                 PEMerr(PEM_F_I2B_PVK_BIO, PEM_R_BIO_WRITE_FAILURE);