RT4053: Typo in error message

[openssl.git] / apps / prime.c

diff --git a/apps/prime.c b/apps/prime.c
index f1aaef8725ea0f698e8c4296f569438926e1b6a4..2ce4e94f8988ceadd8e2c33e9b3605fd5df8773f 100644 (file)
--- a/apps/prime.c
+++ b/apps/prime.c
@@ -6,7 +6,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -52,109 +52,100 @@
 #include "apps.h"
 #include <openssl/bn.h>
 
+typedef enum OPTION_choice {
+    OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
+    OPT_HEX, OPT_GENERATE, OPT_BITS, OPT_SAFE, OPT_CHECKS
+} OPTION_CHOICE;
+
+OPTIONS prime_options[] = {
+    {OPT_HELP_STR, 1, '-', "Usage: %s [options] [number...]\n"},
+    {OPT_HELP_STR, 1, '-',
+        "  number Number to check for primarility\n"},
+    {"help", OPT_HELP, '-', "Display this summary"},
+    {"hex", OPT_HEX, '-', "Hex output"},
+    {"generate", OPT_GENERATE, '-', "Generate a prime"},
+    {"bits", OPT_BITS, 'p', "Size of number in bits"},
+    {"safe", OPT_SAFE, '-',
+     "When used with -generate, generate a safe prime"},
+    {"checks", OPT_CHECKS, 'p', "Number of checks"},
+    {NULL}
+};
+
+int prime_main(int argc, char **argv)
+{
+    BIGNUM *bn = NULL;
+    int hex = 0, checks = 20, generate = 0, bits = 0, safe = 0, ret = 1;
+    char *prog;
+    OPTION_CHOICE o;
+
+    prog = opt_init(argc, argv, prime_options);
+    while ((o = opt_next()) != OPT_EOF) {
+        switch (o) {
+        case OPT_EOF:
+        case OPT_ERR:
+            BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
+            goto end;
+        case OPT_HELP:
+            opt_help(prime_options);
+            ret = 0;
+            goto end;
+        case OPT_HEX:
+            hex = 1;
+            break;
+        case OPT_GENERATE:
+            generate = 1;
+            break;
+        case OPT_BITS:
+            bits = atoi(opt_arg());
+            break;
+        case OPT_SAFE:
+            safe = 1;
+            break;
+        case OPT_CHECKS:
+            checks = atoi(opt_arg());
+            break;
+        }
+    }
+    argc = opt_num_rest();
+    argv = opt_rest();
 
-#undef PROG
-#define PROG prime_main
-
-int MAIN(int, char **);
-
-int MAIN(int argc, char **argv)
-    {
-    int hex=0;
-    int checks=20;
-    int generate=0;
-    int bits=0;
-    int safe=0;
-    BIGNUM *bn=NULL;
-    BIO *bio_out;
-
-    apps_startup();
-
-    if (bio_err == NULL)
-       if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-           BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
-
-    --argc;
-    ++argv;
-    while (argc >= 1 && **argv == '-')
-       {
-       if(!strcmp(*argv,"-hex"))
-           hex=1;
-       else if(!strcmp(*argv,"-generate"))
-           generate=1;
-       else if(!strcmp(*argv,"-bits"))
-           if(--argc < 1)
-               goto bad;
-           else
-               bits=atoi(*++argv);
-       else if(!strcmp(*argv,"-safe"))
-           safe=1;
-       else if(!strcmp(*argv,"-checks"))
-           if(--argc < 1)
-               goto bad;
-           else
-               checks=atoi(*++argv);
-       else
-           {
-           BIO_printf(bio_err,"Unknown option '%s'\n",*argv);
-           goto bad;
-           }
-       --argc;
-       ++argv;
-       }
-
-    if (argv[0] == NULL && !generate)
-       {
-       BIO_printf(bio_err,"No prime specified\n");
-       goto bad;
-       }
-
-    if ((bio_out=BIO_new(BIO_s_file())) != NULL)
-       {
-       BIO_set_fp(bio_out,stdout,BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
-           {
-           BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-           bio_out = BIO_push(tmpbio, bio_out);
-           }
-#endif
-       }
-
-    if(generate)
-       {
-       char *s;
+    if (!app_load_modules(NULL))
+        goto end;
 
-       if(!bits)
-           {
-           BIO_printf(bio_err,"Specifiy the number of bits.\n");
-           return 1;
-           }
-       bn=BN_new();
-       BN_generate_prime_ex(bn,bits,safe,NULL,NULL,NULL);
-       s=hex ? BN_bn2hex(bn) : BN_bn2dec(bn);
-       BIO_printf(bio_out,"%s\n",s);
-       OPENSSL_free(s);
-       }
-    else
-       {
-       if(hex)
-           BN_hex2bn(&bn,argv[0]);
-       else
-           BN_dec2bn(&bn,argv[0]);
+    if (argc == 0 && !generate) {
+        BIO_printf(bio_err, "%s: No prime specified\n", prog);
+        goto end;
+    }
 
-       BN_print(bio_out,bn);
-       BIO_printf(bio_out," is %sprime\n",
-                  BN_is_prime_ex(bn,checks,NULL,NULL) ? "" : "not ");
-       }
+    if (generate) {
+        char *s;
+
+        if (!bits) {
+            BIO_printf(bio_err, "Specify the number of bits.\n");
+            goto end;
+        }
+        bn = BN_new();
+        BN_generate_prime_ex(bn, bits, safe, NULL, NULL, NULL);
+        s = hex ? BN_bn2hex(bn) : BN_bn2dec(bn);
+        BIO_printf(bio_out, "%s\n", s);
+        OPENSSL_free(s);
+    } else {
+        for ( ; *argv; argv++) {
+            if (hex)
+                BN_hex2bn(&bn, argv[0]);
+            else
+                BN_dec2bn(&bn, argv[0]);
+
+            BN_print(bio_out, bn);
+            BIO_printf(bio_out, " (%s) %s prime\n",
+                       argv[0],
+                       BN_is_prime_ex(bn, checks, NULL, NULL)
+                           ? "is" : "is not");
+        }
+    }
 
     BN_free(bn);
-    BIO_free_all(bio_out);
-
-    return 0;
 
-    bad:
-    BIO_printf(bio_err,"options are\n");
-    BIO_printf(bio_err,"%-14s hex\n","-hex");
-    BIO_printf(bio_err,"%-14s number of checks\n","-checks <n>");
-    return 1;
-    }
+ end:
+    return ret;
+}