Synchronise what what's happening with the Unix build

[openssl.git] / apps / genpkey.c

diff --git a/apps/genpkey.c b/apps/genpkey.c
index 453dd500c085a150b36bc95576b16287ca0bd8e8..9a58b64e9299083755aff35332a37fcb750b2c02 100644 (file)
--- a/apps/genpkey.c
+++ b/apps/genpkey.c
@@ -87,7 +87,7 @@ int MAIN(int argc, char **argv)
        int badarg = 0;
        int ret = 1;
 
-       int do_param = -1;
+       int do_param = 0;
 
        if (bio_err == NULL)
                bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
@@ -147,8 +147,6 @@ int MAIN(int argc, char **argv)
                        {
                        if (!args[1])
                                goto bad;
-                       if (do_param == -1)
-                               do_param = 0;
                        if (!init_gen_str(bio_err, &ctx, *(++args),e, do_param))
                                goto end;
                        }
@@ -242,7 +240,8 @@ int MAIN(int argc, char **argv)
                {
                if (EVP_PKEY_paramgen(ctx, &pkey) <= 0)
                        {
-                       BIO_puts(bio_err, "Error generating key\n");
+                       BIO_puts(bio_err, "Error generating parameters\n");
+                       ERR_print_errors(bio_err);
                        goto end;
                        }
                }
@@ -251,6 +250,7 @@ int MAIN(int argc, char **argv)
                if (EVP_PKEY_keygen(ctx, &pkey) <= 0)
                        {
                        BIO_puts(bio_err, "Error generating key\n");
+                       ERR_print_errors(bio_err);
                        goto end;
                        }
                }