Change the printing mahine used by BIO_printf() and friends so it can

[oweals/openssl.git] / crypto / dsa / dsa_lib.c

diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c
index 224e412afc42c3f17e273c899044003e0f8ff1d8..be30d18b8a05ee45c62295aab3909378befe05fe 100644 (file)
--- a/crypto/dsa/dsa_lib.c
+++ b/crypto/dsa/dsa_lib.c
@@ -101,15 +101,14 @@ DSA *DSA_new_method(DSA_METHOD *meth)
        {
        DSA *ret;
 
-       ret=(DSA *)Malloc(sizeof(DSA));
+       ret=(DSA *)OPENSSL_malloc(sizeof(DSA));
        if (ret == NULL)
                {
                DSAerr(DSA_F_DSA_NEW,ERR_R_MALLOC_FAILURE);
                return(NULL);
                }
-       if(!default_DSA_method) default_DSA_method = DSA_OpenSSL();
        if(meth) ret->meth = meth;
-       else ret->meth = default_DSA_method;
+       else ret->meth = DSA_get_default_method();
        ret->pad=0;
        ret->version=0;
        ret->write_params=1;
@@ -128,7 +127,7 @@ DSA *DSA_new_method(DSA_METHOD *meth)
        ret->flags=ret->meth->flags;
        if ((ret->meth->init != NULL) && !ret->meth->init(ret))
                {
-               Free(ret);
+               OPENSSL_free(ret);
                ret=NULL;
                }
        else
@@ -167,7 +166,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);
-       Free(r);
+       OPENSSL_free(r);
        }
 
 int DSA_size(DSA *r)