Fix free errors in ocsp utility.

[openssl.git] / apps / genpkey.c

diff --git a/apps/genpkey.c b/apps/genpkey.c
index 70e2e31971323b84586e476519e2e2fdb212feb9..6dfda08b9e09f2d7ca3e4bea10f3ce27e8ffebeb 100644 (file)
--- a/apps/genpkey.c
+++ b/apps/genpkey.c
@@ -1,5 +1,5 @@
 /* apps/genpkey.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
  */
 /* ====================================================================
@@ -67,8 +67,6 @@
 
 static int init_keygen_file(BIO *err, EVP_PKEY_CTX **pctx,
                                const char *file, ENGINE *e);
-static int init_gen_str(BIO *err, EVP_PKEY_CTX **pctx,
-                               const char *algname, ENGINE *e, int do_param);
 static int genpkey_cb(EVP_PKEY_CTX *ctx);
 
 #define PROG genpkey_main
@@ -198,15 +196,22 @@ int MAIN(int argc, char **argv)
        if (badarg)
                {
                bad:
-               BIO_printf(bio_err, "Usage genpkey [options]\n");
-               BIO_printf(bio_err, "where options are\n");
-               BIO_printf(bio_err, "-paramfile file parameter file\n");
-               BIO_printf(bio_err, "-pass arg       output file pass phrase source\n");
-               BIO_printf(bio_err, "-outform X      output format (DER or PEM)\n");
-               BIO_printf(bio_err, "-out file       output file\n");
+               BIO_printf(bio_err, "Usage: genpkey [options]\n");
+               BIO_printf(bio_err, "where options may be\n");
+               BIO_printf(bio_err, "-out file          output file\n");
+               BIO_printf(bio_err, "-outform X         output format (DER or PEM)\n");
+               BIO_printf(bio_err, "-pass arg          output file pass phrase source\n");
+               BIO_printf(bio_err, "-<cipher>          use cipher <cipher> to encrypt the key\n");
 #ifndef OPENSSL_NO_ENGINE
-               BIO_printf(bio_err, "-engine e       use engine e, possibly a hardware device.\n");
+               BIO_printf(bio_err, "-engine e          use engine e, possibly a hardware device.\n");
 #endif
+               BIO_printf(bio_err, "-paramfile file    parameters file\n");
+               BIO_printf(bio_err, "-algorithm alg     the public key algorithm\n");
+               BIO_printf(bio_err, "-pkeyopt opt:value set the public key algorithm option <opt>\n"
+                                           "                   to value <value>\n");
+               BIO_printf(bio_err, "-genparam          generate parameters, not key\n");
+               BIO_printf(bio_err, "-text              print the in text\n");
+               BIO_printf(bio_err, "NB: options order may be important!  See the manual page.\n");
                goto end;
                }
 
@@ -355,8 +360,8 @@ static int init_keygen_file(BIO *err, EVP_PKEY_CTX **pctx,
 
        }
 
-static int init_gen_str(BIO *err, EVP_PKEY_CTX **pctx,
-                               const char *algname, ENGINE *e, int do_param)
+int init_gen_str(BIO *err, EVP_PKEY_CTX **pctx,
+                       const char *algname, ENGINE *e, int do_param)
        {
        EVP_PKEY_CTX *ctx = NULL;
        const EVP_PKEY_ASN1_METHOD *ameth;
@@ -368,14 +373,22 @@ static int init_gen_str(BIO *err, EVP_PKEY_CTX **pctx,
                BIO_puts(err, "Algorithm already set!\n");
                return 0;
                }
+
        ameth = EVP_PKEY_asn1_find_str(&tmpeng, algname, -1);
 
+#ifndef OPENSSL_NO_ENGINE
+       if (!ameth && e)
+               ameth = ENGINE_get_pkey_asn1_meth_str(e, algname, -1);
+#endif
+
        if (!ameth)
                {
                BIO_printf(bio_err, "Algorithm %s not found\n", algname);
                return 0;
                }
 
+       ERR_clear_error();
+
        EVP_PKEY_asn1_get0_info(&pkey_id, NULL, NULL, NULL, NULL, ameth);
 #ifndef OPENSSL_NO_ENGINE
        if (tmpeng)