BN_CTX is opaque and the static initialiser BN_CTX_init() is not used

[openssl.git] / apps / dsaparam.c

diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index 7ce49d90c3658a03c38cd9698120a80c44c5f430..14e79f9a21e0d33bda3baadf761370fe8957bae7 100644 (file)
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -56,6 +56,12 @@
  * [including the GNU Public Licence.]
  */
 
+/* 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>
 #include <stdio.h>
@@ -69,7 +75,6 @@
 #include <openssl/dsa.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
-#include <openssl/engine.h>
 
 #undef PROG
 #define PROG   dsaparam_main
@@ -83,15 +88,31 @@
  * -C
  * -noout
  * -genkey
+ *  #ifdef GENCB_TEST
+ * -timebomb n  - interrupt keygen after <n> seconds
+ *  #endif
  */
 
-static void MS_CALLBACK dsa_cb(int p, int n, void *arg);
+#ifdef GENCB_TEST
+
+static int stop_keygen_flag = 0;
+
+static void timebomb_sigalarm(int foo)
+       {
+       stop_keygen_flag = 1;
+       }
+
+#endif
+
+static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *cb);
 
 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;
@@ -99,7 +120,12 @@ int MAIN(int argc, char **argv)
        char *infile,*outfile,*prog,*inrand=NULL;
        int numbits= -1,num,genkey=0;
        int need_rand=0;
+#ifndef OPENSSL_NO_ENGINE
        char *engine=NULL;
+#endif
+#ifdef GENCB_TEST
+       int timebomb=0;
+#endif
 
        apps_startup();
 
@@ -107,6 +133,9 @@ int MAIN(int argc, char **argv)
                if ((bio_err=BIO_new(BIO_s_file())) != NULL)
                        BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
+       if (!load_config(bio_err, NULL))
+               goto end;
+
        infile=NULL;
        outfile=NULL;
        informat=FORMAT_PEM;
@@ -137,11 +166,20 @@ int MAIN(int argc, char **argv)
                        if (--argc < 1) goto bad;
                        outfile= *(++argv);
                        }
+#ifndef OPENSSL_NO_ENGINE
                else if(strcmp(*argv, "-engine") == 0)
                        {
                        if (--argc < 1) goto bad;
                        engine = *(++argv);
                        }
+#endif
+#ifdef GENCB_TEST
+               else if(strcmp(*argv, "-timebomb") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       timebomb = atoi(*(++argv));
+                       }
+#endif
                else if (strcmp(*argv,"-text") == 0)
                        text=1;
                else if (strcmp(*argv,"-C") == 0)
@@ -184,11 +222,17 @@ bad:
                BIO_printf(bio_err," -outform arg  output format - DER or PEM\n");
                BIO_printf(bio_err," -in arg       input file\n");
                BIO_printf(bio_err," -out arg      output file\n");
-               BIO_printf(bio_err," -text         print the key in text\n");
+               BIO_printf(bio_err," -text         print as text\n");
                BIO_printf(bio_err," -C            Output C code\n");
                BIO_printf(bio_err," -noout        no output\n");
+               BIO_printf(bio_err," -genkey       generate a DSA key\n");
                BIO_printf(bio_err," -rand         files to use for random number input\n");
+#ifndef OPENSSL_NO_ENGINE
                BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
+#endif
+#ifdef GENCB_TEST
+               BIO_printf(bio_err," -timebomb n   interrupt keygen after <n> seconds\n");
+#endif
                BIO_printf(bio_err," number        number of bits to use for generating private key\n");
                goto end;
                }
@@ -232,7 +276,9 @@ bad:
                        }
                }
 
-        e = ENGINE_setup(engine, bio_err);
+#ifndef OPENSSL_NO_ENGINE
+        e = setup_engine(bio_err, engine, 0);
+#endif
 
        if (need_rand)
                {
@@ -244,10 +290,47 @@ bad:
 
        if (numbits > 0)
                {
+               BN_GENCB cb;
+               BN_GENCB_set(&cb, dsa_cb, bio_err);
                assert(need_rand);
+               dsa = DSA_new();
+               if(!dsa)
+                       {
+                       BIO_printf(bio_err,"Error allocating DSA object\n");
+                       goto end;
+                       }
                BIO_printf(bio_err,"Generating DSA parameters, %d bit long prime\n",num);
                BIO_printf(bio_err,"This could take some time\n");
-               dsa=DSA_generate_parameters(num,NULL,0,NULL,NULL, dsa_cb,bio_err);
+#ifdef GENCB_TEST
+               if(timebomb > 0)
+       {
+               struct sigaction act;
+               act.sa_handler = timebomb_sigalarm;
+               act.sa_flags = 0;
+               BIO_printf(bio_err,"(though I'll stop it if not done within %d secs)\n",
+                               timebomb);
+               if(sigaction(SIGALRM, &act, NULL) != 0)
+                       {
+                       BIO_printf(bio_err,"Error, couldn't set SIGALRM handler\n");
+                       goto end;
+                       }
+               alarm(timebomb);
+       }
+#endif
+               if(!DSA_generate_parameters_ex(dsa,num,NULL,0,NULL,NULL, &cb))
+                       {
+#ifdef GENCB_TEST
+                       if(stop_keygen_flag)
+                               {
+                               BIO_printf(bio_err,"DSA key generation time-stopped\n");
+                               /* This is an asked-for behaviour! */
+                               ret = 0;
+                               goto end;
+                               }
+#endif
+                       BIO_printf(bio_err,"Error, DSA key generation failed\n");
+                       goto end;
+                       }
                }
        else if (informat == FORMAT_ASN1)
                dsa=d2i_DSAparams_bio(in,NULL);
@@ -368,10 +451,11 @@ end:
        if (in != NULL) BIO_free(in);
        if (out != NULL) BIO_free_all(out);
        if (dsa != NULL) DSA_free(dsa);
-       EXIT(ret);
+       apps_shutdown();
+       OPENSSL_EXIT(ret);
        }
 
-static void MS_CALLBACK dsa_cb(int p, int n, void *arg)
+static int MS_CALLBACK dsa_cb(int p, int n, BN_GENCB *cb)
        {
        char c='*';
 
@@ -379,10 +463,15 @@ static void MS_CALLBACK dsa_cb(int p, int n, void *arg)
        if (p == 1) c='+';
        if (p == 2) c='*';
        if (p == 3) c='\n';
-       BIO_write(arg,&c,1);
-       (void)BIO_flush(arg);
+       BIO_write(cb->arg,&c,1);
+       (void)BIO_flush(cb->arg);
 #ifdef LINT
        p=n;
 #endif
+#ifdef GENCB_TEST
+       if(stop_keygen_flag)
+               return 0;
+#endif
+       return 1;
        }
 #endif