diff options
author | Rich Salz <rsalz@akamai.com> | 2015-05-28 13:52:55 -0400 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2015-05-28 17:28:33 -0400 |
commit | cc01d21756cc9c79231ef21039782c5fe42008a2 (patch) | |
tree | cb92584cc79d9994f9859b15c04a645d0b020389 /apps/spkac.c | |
parent | f097f81c891bb1f479426d8ac9c9541390334983 (diff) |
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>
Diffstat (limited to 'apps/spkac.c')
-rw-r--r-- | apps/spkac.c | 14 |
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); |