mark all block comments that need format preserving so that

[openssl.git] / apps / dsaparam.c

diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index fe72c1d3dfa8fb5205143f589168c6199987f2b4..a922335c3107331741f747fa5410238e7ebfbdc3 100644 (file)
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -57,11 +57,6 @@
  */
 
 #include <openssl/opensslconf.h>       /* for OPENSSL_NO_DSA */
-/* Until the key-gen callbacks are modified to use newer prototypes, we allow
- * deprecated functions for openssl-internal code */
-#ifdef OPENSSL_NO_DEPRECATED
-#undef OPENSSL_NO_DEPRECATED
-#endif
 
 #ifndef OPENSSL_NO_DSA
 #include <assert.h>
@@ -80,7 +75,8 @@
 #undef PROG
 #define PROG   dsaparam_main
 
-/* -inform arg - input format - default PEM (DER or PEM)
+/*-
+ * -inform arg - input format - default PEM (DER or PEM)
  * -outform arg - output format - default PEM
  * -in arg     - input file - default stdin
  * -out arg    - output file - default stdout
@@ -118,6 +114,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
@@ -195,6 +193,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 */
@@ -288,8 +288,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)
@@ -297,6 +302,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
@@ -315,7 +322,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)
@@ -326,6 +333,7 @@ bad:
                                goto end;
                                }
 #endif
+                       ERR_print_errors(bio_err);
                        BIO_printf(bio_err,"Error, DSA key generation failed\n");
                        goto end;
                        }
@@ -429,13 +437,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);
@@ -444,6 +460,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);
@@ -459,11 +476,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);
-#ifdef LINT
-       p=n;
-#endif
+       BIO_write(BN_GENCB_get_arg(cb),&c,1);
+       (void)BIO_flush(BN_GENCB_get_arg(cb));
 #ifdef GENCB_TEST
        if(stop_keygen_flag)
                return 0;