AlgorithmIdentifier bugs

[oweals/openssl.git] / crypto / dh / dh_lib.c

diff --git a/crypto/dh/dh_lib.c b/crypto/dh/dh_lib.c
index a8d5340bf4355995dfa76635d626b2169b5547b1..a46270765e5a9b6185db19ee46bbb446a040e5c2 100644 (file)
--- a/crypto/dh/dh_lib.c
+++ b/crypto/dh/dh_lib.c
@@ -63,7 +63,7 @@
 
 const char *DH_version="Diffie-Hellman" OPENSSL_VERSION_PTEXT;
 
-static DH_METHOD *default_DH_method;
+static DH_METHOD *default_DH_method = NULL;
 static int dh_meth_num = 0;
 static STACK_OF(CRYPTO_EX_DATA_FUNCS) *dh_meth = NULL;
 
@@ -120,13 +120,13 @@ DH *DH_new_method(DH_METHOD *meth)
        ret->method_mont_p=NULL;
        ret->references = 1;
        ret->flags=ret->meth->flags;
+       CRYPTO_new_ex_data(dh_meth,ret,&ret->ex_data);
        if ((ret->meth->init != NULL) && !ret->meth->init(ret))
                {
+               CRYPTO_free_ex_data(dh_meth,ret,&ret->ex_data);
                OPENSSL_free(ret);
                ret=NULL;
                }
-       else
-               CRYPTO_new_ex_data(dh_meth,ret,&ret->ex_data);
        return(ret);
        }
 
@@ -147,10 +147,10 @@ void DH_free(DH *r)
        }
 #endif
 
-       CRYPTO_free_ex_data(dh_meth, r, &r->ex_data);
-
        if(r->meth->finish) r->meth->finish(r);
 
+       CRYPTO_free_ex_data(dh_meth, r, &r->ex_data);
+
        if (r->p != NULL) BN_clear_free(r->p);
        if (r->g != NULL) BN_clear_free(r->g);
        if (r->q != NULL) BN_clear_free(r->q);