GH408 follow-on: update buflen
[openssl.git] / apps / pkeyparam.c
index 4319eb4..215611e 100644 (file)
@@ -1,6 +1,6 @@
-/* apps/pkeyparam.c */
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project 2006
+/*
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * 2006
  */
 /* ====================================================================
  * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
@@ -10,7 +10,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
 #include <openssl/err.h>
 #include <openssl/evp.h>
 
-#define PROG pkeyparam_main
-
-int MAIN(int, char **);
-
-int MAIN(int argc, char **argv)
-       {
-       char **args, *infile = NULL, *outfile = NULL;
-       BIO *in = NULL, *out = NULL;
-       int text = 0, noout = 0;
-       EVP_PKEY *pkey=NULL;
-       int badarg = 0;
-#ifndef OPENSSL_NO_ENGINE
-       ENGINE *e = NULL;
-       char *engine=NULL;
-#endif
-       int ret = 1;
-
-       if (bio_err == NULL)
-               bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
-
-       if (!load_config(bio_err, NULL))
-               goto end;
-
-       ERR_load_crypto_strings();
-       OpenSSL_add_all_algorithms();
-       args = argv + 1;
-       while (!badarg && *args && *args[0] == '-')
-               {
-               if (!strcmp (*args, "-in"))
-                       {
-                       if (args[1])
-                               {
-                               args++;
-                               infile = *args;
-                               }
-                       else badarg = 1;
-                       }
-               else if (!strcmp (*args, "-out"))
-                       {
-                       if (args[1])
-                               {
-                               args++;
-                               outfile = *args;
-                               }
-                       else badarg = 1;
-                       }
-#ifndef OPENSSL_NO_ENGINE
-               else if (strcmp(*args,"-engine") == 0)
-                       {
-                       if (!args[1]) goto bad;
-                       engine= *(++args);
-                       }
-#endif
-
-               else if (strcmp(*args,"-text") == 0)
-                       text=1;
-               else if (strcmp(*args,"-noout") == 0)
-                       noout=1;
-               args++;
-               }
-
-       if (badarg)
-               {
-#ifndef OPENSSL_NO_ENGINE
-               bad:
-#endif
-               BIO_printf(bio_err, "Usage pkeyparam [options]\n");
-               BIO_printf(bio_err, "where options are\n");
-               BIO_printf(bio_err, "-in file        input file\n");
-               BIO_printf(bio_err, "-out file       output file\n");
-               BIO_printf(bio_err, "-text           print parameters as text\n");
-               BIO_printf(bio_err, "-noout          don't output encoded parameters\n");
+typedef enum OPTION_choice {
+    OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
+    OPT_IN, OPT_OUT, OPT_TEXT, OPT_NOOUT, OPT_ENGINE
+} OPTION_CHOICE;
+
+OPTIONS pkeyparam_options[] = {
+    {"help", OPT_HELP, '-', "Display this summary"},
+    {"in", OPT_IN, '<', "Input file"},
+    {"out", OPT_OUT, '>', "Output file"},
+    {"text", OPT_TEXT, '-', "Print parameters as text"},
+    {"noout", OPT_NOOUT, '-', "Don't output encoded parameters"},
 #ifndef OPENSSL_NO_ENGINE
-               BIO_printf(bio_err, "-engine e       use engine e, possibly a hardware device.\n");
+    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
 #endif
-               return 1;
-               }
-
-#ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
-#endif
-
-       if (infile)
-               {
-               if (!(in = BIO_new_file (infile, "r")))
-                       {
-                       BIO_printf(bio_err,
-                                "Can't open input file %s\n", infile);
-                       goto end;
-                       }
-               }
-       else
-               in = BIO_new_fp (stdin, BIO_NOCLOSE);
-
-       if (outfile)
-               {
-               if (!(out = BIO_new_file (outfile, "w")))
-                       {
-                       BIO_printf(bio_err,
-                                "Can't open output file %s\n", outfile);
-                       goto end;
-                       }
-               }
-       else
-               {
-               out = BIO_new_fp (stdout, BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
-                       {
-                       BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-                       out = BIO_push(tmpbio, out);
-                       }
-#endif
-               }
-
-       pkey = PEM_read_bio_Parameters(in, NULL);
-       if (!pkey)
-               {
-               BIO_printf(bio_err, "Error reading paramters\n");
-               ERR_print_errors(bio_err);
-               goto end;
-               }
-
-       if (!noout)
-               PEM_write_bio_Parameters(out,pkey);
-
-       if (text)
-               EVP_PKEY_print_params(out, pkey, 0, NULL);
-
-       ret = 0;
-
-       end:
-       EVP_PKEY_free(pkey);
-       BIO_free_all(out);
-       BIO_free(in);
-
-       return ret;
-       }
+    {NULL}
+};
+
+int pkeyparam_main(int argc, char **argv)
+{
+    BIO *in = NULL, *out = NULL;
+    EVP_PKEY *pkey = NULL;
+    int text = 0, noout = 0, ret = 1;
+    OPTION_CHOICE o;
+    char *infile = NULL, *outfile = NULL, *prog;
+
+    prog = opt_init(argc, argv, pkeyparam_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(pkeyparam_options);
+            ret = 0;
+            goto end;
+        case OPT_IN:
+            infile = opt_arg();
+            break;
+        case OPT_OUT:
+            outfile = opt_arg();
+            break;
+        case OPT_ENGINE:
+            (void)setup_engine(opt_arg(), 0);
+            break;
+        case OPT_TEXT:
+            text = 1;
+            break;
+        case OPT_NOOUT:
+            noout = 1;
+            break;
+        }
+    }
+    argc = opt_num_rest();
+    argv = opt_rest();
+
+    if (!app_load_modules(NULL))
+        goto end;
+
+    in = bio_open_default(infile, 'r', FORMAT_PEM);
+    if (in == NULL)
+        goto end;
+    out = bio_open_default(outfile, 'w', FORMAT_PEM);
+    if (out == NULL)
+        goto end;
+    pkey = PEM_read_bio_Parameters(in, NULL);
+    if (!pkey) {
+        BIO_printf(bio_err, "Error reading parameters\n");
+        ERR_print_errors(bio_err);
+        goto end;
+    }
+
+    if (!noout)
+        PEM_write_bio_Parameters(out, pkey);
+
+    if (text)
+        EVP_PKEY_print_params(out, pkey, 0, NULL);
+
+    ret = 0;
+
+ end:
+    EVP_PKEY_free(pkey);
+    BIO_free_all(out);
+    BIO_free(in);
+
+    return ret;
+}