Do to DH and DSA what has already been done to RSA. This involves moving

the initialisation and cleanup of "ex_data" elements to before an init()
handler and after a finish() handler respectively.

diff --git a/crypto/dh/dh_lib.c b/crypto/dh/dh_lib.c
index fcb8142348be4e1a0ca35906b75b74bee31f635e..c0a2472751f600d5162c50437b953c4c7f8f49f2 100644 (file)
--- a/crypto/dh/dh_lib.c
+++ b/crypto/dh/dh_lib.c
@@ -168,13 +168,13 @@ DH *DH_new_method(ENGINE *engine)
        ret->method_mont_p=NULL;
        ret->references = 1;
        ret->flags=meth->flags;
        ret->method_mont_p=NULL;
        ret->references = 1;
        ret->flags=meth->flags;

+       CRYPTO_new_ex_data(dh_meth,ret,&ret->ex_data);

        if ((meth->init != NULL) && !meth->init(ret))
                {
        if ((meth->init != NULL) && !meth->init(ret))
                {

+               CRYPTO_free_ex_data(dh_meth,ret,&ret->ex_data);

                OPENSSL_free(ret);
                ret=NULL;
                }
                OPENSSL_free(ret);
                ret=NULL;
                }

-       else
-               CRYPTO_new_ex_data(dh_meth,ret,&ret->ex_data);

        return(ret);
        }
 
        return(ret);
        }
 


@@ -196,12 +196,12 @@ void DH_free(DH *r)
        }
 #endif
 
        }
 #endif
 

-       CRYPTO_free_ex_data(dh_meth, r, &r->ex_data);
-

        meth = ENGINE_get_DH(r->engine);
        if(meth->finish) meth->finish(r);
        ENGINE_finish(r->engine);
 
        meth = ENGINE_get_DH(r->engine);
        if(meth->finish) meth->finish(r);
        ENGINE_finish(r->engine);
 

+       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);
        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);

diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c
index 5e5bff82aec1e2cd503794a3e085b57e50ea28aa..60027116613437583bbbac27bf14ad2de3217f53 100644 (file)
--- a/crypto/dsa/dsa_lib.c
+++ b/crypto/dsa/dsa_lib.c
@@ -173,13 +173,13 @@ DSA *DSA_new_method(ENGINE *engine)
 
        ret->references=1;
        ret->flags=meth->flags;
 
        ret->references=1;
        ret->flags=meth->flags;

+       CRYPTO_new_ex_data(dsa_meth,ret,&ret->ex_data);

        if ((meth->init != NULL) && !meth->init(ret))
                {
        if ((meth->init != NULL) && !meth->init(ret))
                {

+               CRYPTO_free_ex_data(dsa_meth,ret,&ret->ex_data);

                OPENSSL_free(ret);
                ret=NULL;
                }
                OPENSSL_free(ret);
                ret=NULL;
                }

-       else
-               CRYPTO_new_ex_data(dsa_meth,ret,&ret->ex_data);

        
        return(ret);
        }
        
        return(ret);
        }


@@ -204,12 +204,12 @@ void DSA_free(DSA *r)
                }
 #endif
 
                }
 #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);
 
        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);
        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);