RT3548: Remove unsupported platforms

[openssl.git] / apps / gendh.c

diff --git a/apps/gendh.c b/apps/gendh.c
index 5ad55dae5998142655db91476cf54f552c3981af..ec6842528a5517c6d8b9538bb3a862aaf69dfaa7 100644 (file)
--- a/apps/gendh.c
+++ b/apps/gendh.c
@@ -57,7 +57,9 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef NO_DH
+#include <openssl/opensslconf.h>
+
+#ifndef OPENSSL_NO_DH
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
@@ -71,21 +73,25 @@
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 
-#define DEFBITS        512
+#define DEFBITS        2048
 #undef PROG
 #define PROG gendh_main
 
-static void MS_CALLBACK dh_cb(int p, int n, void *arg);
+static int dh_cb(int p, int n, BN_GENCB *cb);
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
        {
+       BN_GENCB *cb=NULL;
        DH *dh=NULL;
        int ret=1,num=DEFBITS;
        int g=2;
        char *outfile=NULL;
-       char *inrand=NULL,*inegd=NULL;
+       char *inrand=NULL;
+#ifndef OPENSSL_NO_ENGINE
+       char *engine=NULL;
+#endif
        BIO *out=NULL;
 
        apps_startup();
@@ -94,6 +100,15 @@ 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);
 
+       cb = BN_GENCB_new();
+       if(!cb)
+               goto end;
+
+       BN_GENCB_set(cb, dh_cb, bio_err);
+
+       if (!load_config(bio_err, NULL))
+               goto end;
+
        argv++;
        argc--;
        for (;;)
@@ -110,15 +125,17 @@ int MAIN(int argc, char **argv)
                        g=3; */
                else if (strcmp(*argv,"-5") == 0)
                        g=5;
-               else if (strcmp(*argv,"-rand") == 0)
+#ifndef OPENSSL_NO_ENGINE
+               else if (strcmp(*argv,"-engine") == 0)
                        {
                        if (--argc < 1) goto bad;
-                       inrand= *(++argv);
+                       engine= *(++argv);
                        }
-               else if (strcmp(*argv,"-egd") == 0)
+#endif
+               else if (strcmp(*argv,"-rand") == 0)
                        {
                        if (--argc < 1) goto bad;
-                       inegd= *(++argv);
+                       inrand= *(++argv);
                        }
                else
                        break;
@@ -133,13 +150,19 @@ bad:
                BIO_printf(bio_err," -2        - use 2 as the generator value\n");
        /*      BIO_printf(bio_err," -3        - use 3 as the generator value\n"); */
                BIO_printf(bio_err," -5        - use 5 as the generator value\n");
+#ifndef OPENSSL_NO_ENGINE
+               BIO_printf(bio_err," -engine e - use engine e, possibly a hardware device.\n");
+#endif
                BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
                BIO_printf(bio_err,"           - load the file (or the files in the directory) into\n");
                BIO_printf(bio_err,"             the random number generator\n");
-               BIO_printf(bio_err," -egd file - load random seed from EGD socket\n");
                goto end;
                }
                
+#ifndef OPENSSL_NO_ENGINE
+        setup_engine(bio_err, engine, 0);
+#endif
+
        out=BIO_new(BIO_s_file());
        if (out == NULL)
                {
@@ -148,7 +171,15 @@ bad:
                }
 
        if (outfile == NULL)
+               {
                BIO_set_fp(out,stdout,BIO_NOCLOSE);
+#ifdef OPENSSL_SYS_VMS
+               {
+               BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+               out = BIO_push(tmpbio, out);
+               }
+#endif
+               }
        else
                {
                if (BIO_write_filename(out,outfile) <= 0)
@@ -158,23 +189,20 @@ bad:
                        }
                }
 
-       if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL && inegd == NULL)
+       if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL)
                {
                BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
                }
        if (inrand != NULL)
                BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
                        app_RAND_load_files(inrand));
-       if (inegd != NULL)
-               BIO_printf(bio_err,"%ld egd bytes loaded\n",
-                       RAND_egd(inegd));
 
        BIO_printf(bio_err,"Generating DH parameters, %d bit long safe prime, generator %d\n",num,g);
        BIO_printf(bio_err,"This is going to take a long time\n");
-       dh=DH_generate_parameters(num,g,dh_cb,bio_err);
-               
-       if (dh == NULL) goto end;
 
+       if(((dh = DH_new()) == NULL) || !DH_generate_parameters_ex(dh, num, g, cb))
+               goto end;
+               
        app_RAND_write_file(NULL, bio_err);
 
        if (!PEM_write_bio_DHparams(out,dh))
@@ -183,12 +211,14 @@ bad:
 end:
        if (ret != 0)
                ERR_print_errors(bio_err);
-       if (out != NULL) BIO_free(out);
+       if (out != NULL) BIO_free_all(out);
        if (dh != NULL) DH_free(dh);
-       EXIT(ret);
+       if (cb != NULL) BN_GENCB_free(cb);
+       apps_shutdown();
+       OPENSSL_EXIT(ret);
        }
 
-static void MS_CALLBACK dh_cb(int p, int n, void *arg)
+static int dh_cb(int p, int n, BN_GENCB *cb)
        {
        char c='*';
 
@@ -196,10 +226,14 @@ static void MS_CALLBACK dh_cb(int p, int n, void *arg)
        if (p == 1) c='+';
        if (p == 2) c='*';
        if (p == 3) c='\n';
-       BIO_write((BIO *)arg,&c,1);
-       (void)BIO_flush((BIO *)arg);
-#ifdef LINT
-       p=n;
-#endif
+       BIO_write(BN_GENCB_get_arg(cb),&c,1);
+       (void)BIO_flush(BN_GENCB_get_arg(cb));
+       return 1;
        }
+#else /* !OPENSSL_NO_DH */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
 #endif