5 files changed, 16 insertions, 16 deletions

diff --git a/src/lib/libcrypto/dsa/dsa_ameth.c b/src/lib/libcrypto/dsa/dsa_ameth.c
index 376156ec5e..e9c549802d 100644
--- a/src/lib/libcrypto/dsa/dsa_ameth.c
+++ b/src/lib/libcrypto/dsa/dsa_ameth.c
@@ -176,7 +176,7 @@ static int dsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
 
         err:
         if (penc)
-                OPENSSL_free(penc);
+                free(penc);
         if (pval)
                 ASN1_STRING_free(pval);
 
@@ -344,7 +344,7 @@ static int dsa_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)
@@ -459,7 +459,7 @@ static int do_dsa_print(BIO *bp, const DSA *x, int off, int ptype)
         update_buflen(priv_key, &buf_len);
         update_buflen(pub_key, &buf_len);
 
-        m=(unsigned char *)OPENSSL_malloc(buf_len+10);
+        m=(unsigned char *)malloc(buf_len+10);
         if (m == NULL)
                 {
                 DSAerr(DSA_F_DO_DSA_PRINT,ERR_R_MALLOC_FAILURE);
@@ -483,7 +483,7 @@ static int do_dsa_print(BIO *bp, const DSA *x, int off, int ptype)
         if (!ASN1_bn_print(bp,"G:   ",x->g,m,off)) goto err;
         ret=1;
 err:
-        if (m != NULL) OPENSSL_free(m);
+        if (m != NULL) free(m);
         return(ret);
         }
 
@@ -564,7 +564,7 @@ static int dsa_sig_print(BIO *bp, const X509_ALGOR *sigalg,
                 unsigned char *m=NULL;
                 update_buflen(dsa_sig->r, &buf_len);
                 update_buflen(dsa_sig->s, &buf_len);
-                m = OPENSSL_malloc(buf_len+10);
+                m = malloc(buf_len+10);
                 if (m == NULL)
                         {
                         DSAerr(DSA_F_DSA_SIG_PRINT,ERR_R_MALLOC_FAILURE);
@@ -581,7 +581,7 @@ static int dsa_sig_print(BIO *bp, const X509_ALGOR *sigalg,
                 rv = 1;
                 err:
                 if (m)
-                        OPENSSL_free(m);
+                        free(m);
                 DSA_SIG_free(dsa_sig);
                 return rv;
                 }
diff --git a/src/lib/libcrypto/dsa/dsa_asn1.c b/src/lib/libcrypto/dsa/dsa_asn1.c
index 19528dcd7a..f8a918d72c 100644
--- a/src/lib/libcrypto/dsa/dsa_asn1.c
+++ b/src/lib/libcrypto/dsa/dsa_asn1.c
@@ -69,7 +69,7 @@ static int sig_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
 {
         if(operation == ASN1_OP_NEW_PRE) {
                 DSA_SIG *sig;
-                sig = OPENSSL_malloc(sizeof(DSA_SIG));
+                sig = malloc(sizeof(DSA_SIG));
                 if (!sig)
                         {
                         DSAerr(DSA_F_SIG_CB, ERR_R_MALLOC_FAILURE);
diff --git a/src/lib/libcrypto/dsa/dsa_lib.c b/src/lib/libcrypto/dsa/dsa_lib.c
index 897c085968..27a4c66618 100644
--- a/src/lib/libcrypto/dsa/dsa_lib.c
+++ b/src/lib/libcrypto/dsa/dsa_lib.c
@@ -116,7 +116,7 @@ DSA *DSA_new_method(ENGINE *engine)
         {
         DSA *ret;
 
-        ret=(DSA *)OPENSSL_malloc(sizeof(DSA));
+        ret=(DSA *)malloc(sizeof(DSA));
         if (ret == NULL)
                 {
                 DSAerr(DSA_F_DSA_NEW_METHOD,ERR_R_MALLOC_FAILURE);
@@ -129,7 +129,7 @@ DSA *DSA_new_method(ENGINE *engine)
                 if (!ENGINE_init(engine))
                         {
                         DSAerr(DSA_F_DSA_NEW_METHOD, ERR_R_ENGINE_LIB);
-                        OPENSSL_free(ret);
+                        free(ret);
                         return NULL;
                         }
                 ret->engine = engine;
@@ -144,7 +144,7 @@ DSA *DSA_new_method(ENGINE *engine)
                         DSAerr(DSA_F_DSA_NEW_METHOD,
                                 ERR_R_ENGINE_LIB);
                         ENGINE_finish(ret->engine);
-                        OPENSSL_free(ret);
+                        free(ret);
                         return NULL;
                         }
                 }
@@ -174,7 +174,7 @@ DSA *DSA_new_method(ENGINE *engine)
                         ENGINE_finish(ret->engine);
 #endif
                 CRYPTO_free_ex_data(CRYPTO_EX_INDEX_DSA, ret, &ret->ex_data);
-                OPENSSL_free(ret);
+                free(ret);
                 ret=NULL;
                 }
         
@@ -216,7 +216,7 @@ void DSA_free(DSA *r)
         if (r->priv_key != NULL) BN_clear_free(r->priv_key);
         if (r->kinv != NULL) BN_clear_free(r->kinv);
         if (r->r != NULL) BN_clear_free(r->r);
-        OPENSSL_free(r);
+        free(r);
         }
 
 int DSA_up_ref(DSA *r)
diff --git a/src/lib/libcrypto/dsa/dsa_pmeth.c b/src/lib/libcrypto/dsa/dsa_pmeth.c
index 715d8d675b..7076bf7b67 100644
--- a/src/lib/libcrypto/dsa/dsa_pmeth.c
+++ b/src/lib/libcrypto/dsa/dsa_pmeth.c
@@ -81,7 +81,7 @@ typedef struct
 static int pkey_dsa_init(EVP_PKEY_CTX *ctx)
         {
         DSA_PKEY_CTX *dctx;
-        dctx = OPENSSL_malloc(sizeof(DSA_PKEY_CTX));
+        dctx = malloc(sizeof(DSA_PKEY_CTX));
         if (!dctx)
                 return 0;
         dctx->nbits = 1024;
@@ -114,7 +114,7 @@ static void pkey_dsa_cleanup(EVP_PKEY_CTX *ctx)
         {
         DSA_PKEY_CTX *dctx = ctx->data;
         if (dctx)
-                OPENSSL_free(dctx);
+                free(dctx);
         }
 
 static int pkey_dsa_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
diff --git a/src/lib/libcrypto/dsa/dsa_sign.c b/src/lib/libcrypto/dsa/dsa_sign.c
index e02365a8b1..5f48d6b622 100644
--- a/src/lib/libcrypto/dsa/dsa_sign.c
+++ b/src/lib/libcrypto/dsa/dsa_sign.c
@@ -76,7 +76,7 @@ int DSA_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp)
 DSA_SIG *DSA_SIG_new(void)
         {
         DSA_SIG *sig;
-        sig = OPENSSL_malloc(sizeof(DSA_SIG));
+        sig = malloc(sizeof(DSA_SIG));
         if (!sig)
                 return NULL;
         sig->r = NULL;
@@ -92,7 +92,7 @@ void DSA_SIG_free(DSA_SIG *sig)
                         BN_free(sig->r);
                 if (sig->s)
                         BN_free(sig->s);
-                OPENSSL_free(sig);
+                free(sig);
                 }
         }