Implement internally opaque bn access from dsa

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

diff --git a/crypto/dsa/dsa_pmeth.c b/crypto/dsa/dsa_pmeth.c
index 4c7a5a847b3e8350ea4234360b6a5d1509e30dec..2f0586a5413bf94a6886ccd3f287105f556248d9 100644 (file)
--- a/crypto/dsa/dsa_pmeth.c
+++ b/crypto/dsa/dsa_pmeth.c
@@ -246,20 +246,25 @@ static int pkey_dsa_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
        {
        DSA *dsa = NULL;
        DSA_PKEY_CTX *dctx = ctx->data;
-       BN_GENCB *pcb, cb;
+       BN_GENCB *pcb;
        int ret;
        if (ctx->pkey_gencb)
                {
-               pcb = &cb;
+               pcb = BN_GENCB_new();
+               if(!pcb) return 0;
                evp_pkey_set_cb_translate(pcb, ctx);
                }
        else
                pcb = NULL;
        dsa = DSA_new();
        if (!dsa)
+               {
+               if(pcb) BN_GENCB_free(pcb);
                return 0;
+               }
        ret = dsa_builtin_paramgen(dsa, dctx->nbits, dctx->qbits, dctx->pmd,
                                   NULL, 0, NULL, NULL, NULL, pcb);
+       if(pcb) BN_GENCB_free(pcb);
        if (ret)
                EVP_PKEY_assign_DSA(pkey, dsa);
        else