This commit was manufactured by cvs2svn to create branch

[oweals/openssl.git] / apps / gendh.c

diff --git a/apps/gendh.c b/apps/gendh.c
index 14928d84a3e724b9378ed462463092a9515c5a41..e0c7889a31e119a680f16cc112cdb071245bbf6c 100644 (file)
--- a/apps/gendh.c
+++ b/apps/gendh.c
@@ -57,7 +57,7 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef OPENSSL_NO_DH
+#ifndef NO_DH
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
@@ -70,7 +70,6 @@
 #include <openssl/dh.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
-#include <openssl/engine.h>
 
 #define DEFBITS        512
 #undef PROG
@@ -82,13 +81,11 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
        {
-       ENGINE *e = NULL;
        DH *dh=NULL;
        int ret=1,num=DEFBITS;
        int g=2;
        char *outfile=NULL;
        char *inrand=NULL;
-       char *engine=NULL;
        BIO *out=NULL;
 
        apps_startup();
@@ -113,11 +110,6 @@ int MAIN(int argc, char **argv)
                        g=3; */
                else if (strcmp(*argv,"-5") == 0)
                        g=5;
-               else if (strcmp(*argv,"-engine") == 0)
-                       {
-                       if (--argc < 1) goto bad;
-                       engine= *(++argv);
-                       }
                else if (strcmp(*argv,"-rand") == 0)
                        {
                        if (--argc < 1) goto bad;
@@ -133,18 +125,15 @@ int MAIN(int argc, char **argv)
 bad:
                BIO_printf(bio_err,"usage: gendh [args] [numbits]\n");
                BIO_printf(bio_err," -out file - output the key to 'file\n");
-               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");
-               BIO_printf(bio_err," -engine e - use engine e, possibly a hardware device.\n");
+               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");
                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");
                goto end;
                }
                
-        e = setup_engine(bio_err, engine, 0);
-
        out=BIO_new(BIO_s_file());
        if (out == NULL)
                {
@@ -155,7 +144,7 @@ bad:
        if (outfile == NULL)
                {
                BIO_set_fp(out,stdout,BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
                {
                BIO *tmpbio = BIO_new(BIO_f_linebuffer());
                out = BIO_push(tmpbio, out);