RT3876: Only load config when needed

Create app_load_config(), a routine to load config file.  Remove the
"always load config" from the main app.  Change the places that used to
load config to call the new common routine.

Reviewed-by: Richard Levitte <levitte@openssl.org>

1 files changed, 2 insertions, 12 deletions

diff --git a/apps/spkac.c b/apps/spkac.c
index abae0e14ac..bd99f0e66a 100644
--- a/apps/spkac.c
+++ b/apps/spkac.c
@@ -95,7 +95,7 @@ OPTIONS spkac_options[] = {
 
 int spkac_main(int argc, char **argv)
 {
-    BIO *in = NULL, *out = NULL;
+    BIO *out = NULL;
     CONF *conf = NULL;
     ENGINE *e = NULL;
     EVP_PKEY *pkey = NULL;
@@ -184,18 +184,9 @@ int spkac_main(int argc, char **argv)
         goto end;
     }
 
-    in = bio_open_default(infile, "r");
-    if (in == NULL)
+    if ((conf = app_load_config(infile)) == NULL)
         goto end;
 
-    conf = NCONF_new(NULL);
-    i = NCONF_load_bio(conf, in, NULL);
-    if (!i) {
-        BIO_printf(bio_err, "Error parsing config file\n");
-        ERR_print_errors(bio_err);
-        goto end;
-    }
-
     spkstr = NCONF_get_string(conf, spksect, spkac);
 
     if (!spkstr) {
@@ -237,7 +228,6 @@ int spkac_main(int argc, char **argv)
  end:
     NCONF_free(conf);
     NETSCAPE_SPKI_free(spki);
-    BIO_free(in);
     BIO_free_all(out);
     EVP_PKEY_free(pkey);
     OPENSSL_free(passin);