more vxworks patches

[openssl.git] / apps / pkeyparam.c

diff --git a/apps/pkeyparam.c b/apps/pkeyparam.c
index 15a8a2bafb3bfb822aa81db20aad31911b8f13fe..6f7a357a36c40428eded3aae4ee7af830133202e 100644 (file)
--- a/apps/pkeyparam.c
+++ b/apps/pkeyparam.c
@@ -1,5 +1,5 @@
 /* apps/pkeyparam.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006
  */
 /* ====================================================================
@@ -68,7 +68,6 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
        {
-       ENGINE *e = NULL;
        char **args, *infile = NULL, *outfile = NULL;
        BIO *in = NULL, *out = NULL;
        int text = 0, noout = 0;
@@ -125,11 +124,15 @@ int MAIN(int argc, char **argv)
 
        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");
 #ifndef OPENSSL_NO_ENGINE
                BIO_printf(bio_err, "-engine e       use engine e, possibly a hardware device.\n");
 #endif
@@ -137,7 +140,7 @@ int MAIN(int argc, char **argv)
                }
 
 #ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+        setup_engine(bio_err, engine, 0);
 #endif
 
        if (infile)
@@ -175,7 +178,7 @@ int MAIN(int argc, char **argv)
        pkey = PEM_read_bio_Parameters(in, NULL);
        if (!pkey)
                {
-               BIO_printf(bio_err, "Error reading paramters\n");
+               BIO_printf(bio_err, "Error reading parameters\n");
                ERR_print_errors(bio_err);
                goto end;
                }