Silence Clang warning about unit'd variable

[openssl.git] / apps / pkey.c

diff --git a/apps/pkey.c b/apps/pkey.c
index 3597be0ee6afd83c4a2ce5cda71698c4bd364f6b..875087fd18fe4420f9fbbb93e25c5264458d90f0 100644 (file)
--- a/apps/pkey.c
+++ b/apps/pkey.c
@@ -97,7 +97,7 @@ int pkey_main(int argc, char **argv)
     EVP_PKEY *pkey = NULL;
     const EVP_CIPHER *cipher = NULL;
     char *infile = NULL, *outfile = NULL, *passin = NULL, *passout = NULL;
     EVP_PKEY *pkey = NULL;
     const EVP_CIPHER *cipher = NULL;
     char *infile = NULL, *outfile = NULL, *passin = NULL, *passout = NULL;

-    char *passinarg = NULL, *passoutarg = NULL, *prog, *engine = NULL;
+    char *passinarg = NULL, *passoutarg = NULL, *prog;

     OPTION_CHOICE o;
     int informat = FORMAT_PEM, outformat = FORMAT_PEM;
     int pubin = 0, pubout = 0, pubtext = 0, text = 0, noout = 0, ret = 1;
     OPTION_CHOICE o;
     int informat = FORMAT_PEM, outformat = FORMAT_PEM;
     int pubin = 0, pubout = 0, pubtext = 0, text = 0, noout = 0, ret = 1;


@@ -129,7 +129,7 @@ int pkey_main(int argc, char **argv)
             passoutarg = opt_arg();
             break;
         case OPT_ENGINE:
             passoutarg = opt_arg();
             break;
         case OPT_ENGINE:

-            engine = opt_arg();
+            e = setup_engine(opt_arg(), 0);

             break;
         case OPT_IN:
             infile = opt_arg();
             break;
         case OPT_IN:
             infile = opt_arg();


@@ -160,15 +160,14 @@ int pkey_main(int argc, char **argv)
     argc = opt_num_rest();
     argv = opt_rest();
 
     argc = opt_num_rest();
     argv = opt_rest();
 

-#ifndef OPENSSL_NO_ENGINE
-    e = setup_engine(engine, 0);
-#endif
-

     if (!app_passwd(passinarg, passoutarg, &passin, &passout)) {
         BIO_printf(bio_err, "Error getting passwords\n");
         goto end;
     }
 
     if (!app_passwd(passinarg, passoutarg, &passin, &passout)) {
         BIO_printf(bio_err, "Error getting passwords\n");
         goto end;
     }
 

+    if (!app_load_modules(NULL))
+        goto end;
+

     out = bio_open_default(outfile, "wb");
     if (out == NULL)
         goto end;
     out = bio_open_default(outfile, "wb");
     if (out == NULL)
         goto end;


@@ -212,10 +211,8 @@ int pkey_main(int argc, char **argv)
     EVP_PKEY_free(pkey);
     BIO_free_all(out);
     BIO_free(in);
     EVP_PKEY_free(pkey);
     BIO_free_all(out);
     BIO_free(in);

-    if (passin)
-        OPENSSL_free(passin);
-    if (passout)
-        OPENSSL_free(passout);
+    OPENSSL_free(passin);
+    OPENSSL_free(passout);

 
     return ret;
 }
 
     return ret;
 }