Update apps for bn opaque change

[openssl.git] / apps / dsaparam.c

diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index 4305a739b33132645c41f8d644c9f962a784f83a..e51f5026de84ba4f92458d2b697262ade9aa0ec0 100644 (file)
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -111,9 +111,6 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
        {
-#ifndef OPENSSL_NO_ENGINE
-       ENGINE *e = NULL;
-#endif
        DSA *dsa=NULL;
        int i,badops=0,text=0;
        BIO *in=NULL,*out=NULL;
@@ -121,6 +118,8 @@ int MAIN(int argc, char **argv)
        char *infile,*outfile,*prog,*inrand=NULL;
        int numbits= -1,num,genkey=0;
        int need_rand=0;
+       int non_fips_allow = 0;
+       BN_GENCB *cb = NULL;
 #ifndef OPENSSL_NO_ENGINE
        char *engine=NULL;
 #endif
@@ -198,6 +197,8 @@ int MAIN(int argc, char **argv)
                        }
                else if (strcmp(*argv,"-noout") == 0)
                        noout=1;
+               else if (strcmp(*argv,"-non-fips-allow") == 0)
+                       non_fips_allow = 1;
                else if (sscanf(*argv,"%d",&num) == 1)
                        {
                        /* generate a key */
@@ -278,7 +279,7 @@ bad:
                }
 
 #ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+        setup_engine(bio_err, engine, 0);
 #endif
 
        if (need_rand)
@@ -291,8 +292,13 @@ bad:
 
        if (numbits > 0)
                {
-               BN_GENCB cb;
-               BN_GENCB_set(&cb, dsa_cb, bio_err);
+               cb = BN_GENCB_new();
+               if(!cb)
+                       {
+                       BIO_printf(bio_err,"Error allocating BN_GENCB object\n");
+                       goto end;
+                       }
+               BN_GENCB_set(cb, dsa_cb, bio_err);
                assert(need_rand);
                dsa = DSA_new();
                if(!dsa)
@@ -300,6 +306,8 @@ bad:
                        BIO_printf(bio_err,"Error allocating DSA object\n");
                        goto end;
                        }
+               if (non_fips_allow)
+                       dsa->flags |= DSA_FLAG_NON_FIPS_ALLOW;
                BIO_printf(bio_err,"Generating DSA parameters, %d bit long prime\n",num);
                BIO_printf(bio_err,"This could take some time\n");
 #ifdef GENCB_TEST
@@ -318,7 +326,7 @@ bad:
                alarm(timebomb);
        }
 #endif
-               if(!DSA_generate_parameters_ex(dsa,num,NULL,0,NULL,NULL, &cb))
+               if(!DSA_generate_parameters_ex(dsa,num,NULL,0,NULL,NULL, cb))
                        {
 #ifdef GENCB_TEST
                        if(stop_keygen_flag)
@@ -329,6 +337,7 @@ bad:
                                goto end;
                                }
 #endif
+                       ERR_print_errors(bio_err);
                        BIO_printf(bio_err,"Error, DSA key generation failed\n");
                        goto end;
                        }
@@ -357,12 +366,10 @@ bad:
        if (C)
                {
                unsigned char *data;
-               int l,len,bits_p,bits_q,bits_g;
+               int l,len,bits_p;
 
                len=BN_num_bytes(dsa->p);
                bits_p=BN_num_bits(dsa->p);
-               bits_q=BN_num_bits(dsa->q);
-               bits_g=BN_num_bits(dsa->g);
                data=(unsigned char *)OPENSSL_malloc(len+20);
                if (data == NULL)
                        {
@@ -434,13 +441,21 @@ bad:
 
                assert(need_rand);
                if ((dsakey=DSAparams_dup(dsa)) == NULL) goto end;
-               if (!DSA_generate_key(dsakey)) goto end;
+               if (non_fips_allow)
+                       dsakey->flags |= DSA_FLAG_NON_FIPS_ALLOW;
+               if (!DSA_generate_key(dsakey))
+                       {
+                       ERR_print_errors(bio_err);
+                       DSA_free(dsakey);
+                       goto end;
+                       }
                if      (outformat == FORMAT_ASN1)
                        i=i2d_DSAPrivateKey_bio(out,dsakey);
                else if (outformat == FORMAT_PEM)
                        i=PEM_write_bio_DSAPrivateKey(out,dsakey,NULL,NULL,0,NULL,NULL);
                else    {
                        BIO_printf(bio_err,"bad output format specified for outfile\n");
+                       DSA_free(dsakey);
                        goto end;
                        }
                DSA_free(dsakey);
@@ -449,6 +464,7 @@ bad:
                app_RAND_write_file(NULL, bio_err);
        ret=0;
 end:
+       if (cb != NULL) BN_GENCB_free(cb);
        if (in != NULL) BIO_free(in);
        if (out != NULL) BIO_free_all(out);
        if (dsa != NULL) DSA_free(dsa);
@@ -464,8 +480,8 @@ static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *cb)
        if (p == 1) c='+';
        if (p == 2) c='*';
        if (p == 3) c='\n';
-       BIO_write(cb->arg,&c,1);
-       (void)BIO_flush(cb->arg);
+       BIO_write(BN_GENCB_get_arg(cb),&c,1);
+       (void)BIO_flush(BN_GENCB_get_arg(cb));
 #ifdef LINT
        p=n;
 #endif