In RSA, DSA, DH, and RAND - if the "***_new()" function fails because the

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

diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c
index 5e5bff82aec1e2cd503794a3e085b57e50ea28aa..1b33705f46357721761b431b1a59d55f215c0f9b 100644 (file)
--- a/crypto/dsa/dsa_lib.c
+++ b/crypto/dsa/dsa_lib.c
@@ -152,6 +152,7 @@ DSA *DSA_new_method(ENGINE *engine)
                {
                if((ret->engine=ENGINE_get_default_DSA()) == NULL)
                        {
+                       DSAerr(DSA_F_DSA_NEW,ERR_LIB_ENGINE);
                        OPENSSL_free(ret);
                        return NULL;
                        }
@@ -173,13 +174,13 @@ DSA *DSA_new_method(ENGINE *engine)
 
        ret->references=1;
        ret->flags=meth->flags;
+       CRYPTO_new_ex_data(dsa_meth,ret,&ret->ex_data);
        if ((meth->init != NULL) && !meth->init(ret))
                {
+               CRYPTO_free_ex_data(dsa_meth,ret,&ret->ex_data);
                OPENSSL_free(ret);
                ret=NULL;
                }
-       else
-               CRYPTO_new_ex_data(dsa_meth,ret,&ret->ex_data);
        
        return(ret);
        }
@@ -204,12 +205,12 @@ void DSA_free(DSA *r)
                }
 #endif
 
-       CRYPTO_free_ex_data(dsa_meth, r, &r->ex_data);
-
        meth = ENGINE_get_DSA(r->engine);
        if(meth->finish) meth->finish(r);
        ENGINE_finish(r->engine);
 
+       CRYPTO_free_ex_data(dsa_meth, r, &r->ex_data);
+
        if (r->p != NULL) BN_clear_free(r->p);
        if (r->q != NULL) BN_clear_free(r->q);
        if (r->g != NULL) BN_clear_free(r->g);
@@ -257,7 +258,7 @@ void *DSA_get_ex_data(DSA *d, int idx)
        return(CRYPTO_get_ex_data(&d->ex_data,idx));
        }
 
-#ifndef NO_DH
+#ifndef OPENSSL_NO_DH
 DH *DSA_dup_DH(const DSA *r)
        {
        /* DSA has p, q, g, optional pub_key, optional priv_key.