Fix option processing.

[openssl.git] / apps / gendsa.c

diff --git a/apps/gendsa.c b/apps/gendsa.c
index 564a881ae634aeb31b92b5301c0259e85b76ce4c..bf186739e685a33eb1124537ed1f46d9a7d7fb21 100644 (file)
--- a/apps/gendsa.c
+++ b/apps/gendsa.c
@@ -56,32 +56,26 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef NO_DSA
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "apps.h"
-#include "bio.h"
-#include "rand.h"
-#include "err.h"
-#include "bn.h"
-#include "dsa.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/rand.h>
+#include <openssl/err.h>
+#include <openssl/bn.h>
+#include <openssl/dsa.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 #define DEFBITS        512
 #undef PROG
 #define PROG gendsa_main
 
-#ifndef NOPROTO
 static long dsa_load_rand(char *names);
-#else
-static long dsa_load_rand();
-#endif
-
-int MAIN(argc, argv)
-int argc;
-char **argv;
+int MAIN(int argc, char **argv)
        {
        char buffer[200];
        DSA *dsa=NULL;
@@ -114,10 +108,6 @@ char **argv;
                        }
                else if (strcmp(*argv,"-") == 0)
                        goto bad;
-               else if (dsaparams == NULL)
-                       {
-                       dsaparams= *argv;
-                       }
 #ifndef NO_DES
                else if (strcmp(*argv,"-des") == 0)
                        enc=EVP_des_cbc();
@@ -128,6 +118,10 @@ char **argv;
                else if (strcmp(*argv,"-idea") == 0)
                        enc=EVP_idea_cbc();
 #endif
+               else if (dsaparams == NULL)
+                       {
+                       dsaparams = *argv;
+                       }
                else
                        goto bad;
                argv++;
@@ -137,7 +131,7 @@ char **argv;
        if (dsaparams == NULL)
                {
 bad:
-               BIO_printf(bio_err,"usage: gendsa [args] [dsaparams]\n");
+               BIO_printf(bio_err,"usage: gendsa [args] dsaparam-file\n");
                BIO_printf(bio_err," -out file - output the key to 'file'\n");
 #ifndef NO_DES
                BIO_printf(bio_err," -des      - encrypt the generated key with DES in cbc mode\n");
@@ -149,6 +143,8 @@ bad:
                BIO_printf(bio_err," -rand file:file:...\n");
                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," dsaparam-file\n");
+               BIO_printf(bio_err,"           - a DSA parameter file as generated by the dsaparam command\n");
                goto end;
                }
 
@@ -212,8 +208,7 @@ end:
        EXIT(ret);
        }
 
-static long dsa_load_rand(name)
-char *name;
+static long dsa_load_rand(char *name)
        {
        char *p,*n;
        int last;
@@ -234,5 +229,4 @@ char *name;
                }
        return(tot);
        }
-
-
+#endif