Fix problem occuring when used from OpenSSH on Solaris 8.

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

diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c
index 5e5bff82aec1e2cd503794a3e085b57e50ea28aa..607f84e45b9cd7e7585b65bb10e506d21f848856 100644 (file)
--- a/crypto/dsa/dsa_lib.c
+++ b/crypto/dsa/dsa_lib.c
@@ -67,7 +67,7 @@
 
 const char *DSA_version="DSA" OPENSSL_VERSION_PTEXT;
 
-static const DSA_METHOD *default_DSA_method;
+static const DSA_METHOD *default_DSA_method = NULL;
 static int dsa_meth_num = 0;
 static STACK_OF(CRYPTO_EX_DATA_FUNCS) *dsa_meth = NULL;
 
@@ -146,16 +146,24 @@ DSA *DSA_new_method(ENGINE *engine)
                DSAerr(DSA_F_DSA_NEW,ERR_R_MALLOC_FAILURE);
                return(NULL);
                }
-       if(engine)
-               ret->engine = engine;
+
+       if (engine)
+               {
+               if(ENGINE_init(engine))
+                       ret->engine = engine;
+               else 
+                       ret->engine = NULL;
+               }
        else
+               ret->engine=ENGINE_get_default_DSA();
+
+       if(ret->engine == NULL)
                {
-               if((ret->engine=ENGINE_get_default_DSA()) == NULL)
-                       {
-                       OPENSSL_free(ret);
-                       return NULL;
-                       }
+               DSAerr(DSA_F_DSA_NEW,ERR_LIB_ENGINE);
+               OPENSSL_free(ret);
+               return NULL;
                }
+
        meth = ENGINE_get_DSA(ret->engine);
        ret->pad=0;
        ret->version=0;
@@ -173,13 +181,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 +212,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 +265,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.