RT3876: Only load config when needed

[openssl.git] / apps / asn1pars.c

diff --git a/apps/asn1pars.c b/apps/asn1pars.c
index 42338da1d44543ca988ed22d33cde1cd60b6404e..d188f4a5c19dd42ce8b19dbc217b9ff70c84626f 100644 (file)
--- a/apps/asn1pars.c
+++ b/apps/asn1pars.c
@@ -334,14 +334,12 @@ static int do_generate(char *genstr, char *genconf, BUF_MEM *buf)
 {
     CONF *cnf = NULL;
     int len;
 {
     CONF *cnf = NULL;
     int len;

-    long errline = 0;

     unsigned char *p;
     ASN1_TYPE *atyp = NULL;
 
     if (genconf) {
     unsigned char *p;
     ASN1_TYPE *atyp = NULL;
 
     if (genconf) {

-        cnf = NCONF_new(NULL);
-        if (!NCONF_load(cnf, genconf, &errline))
-            goto conferr;
+        if ((cnf = app_load_config(genconf)) == NULL)
+            goto err;

         if (!genstr)
             genstr = NCONF_get_string(cnf, "default", "asn1");
         if (!genstr) {
         if (!genstr)
             genstr = NCONF_get_string(cnf, "default", "asn1");
         if (!genstr) {


@@ -372,18 +370,8 @@ static int do_generate(char *genstr, char *genconf, BUF_MEM *buf)
     ASN1_TYPE_free(atyp);
     return len;
 
     ASN1_TYPE_free(atyp);
     return len;
 

- conferr:
-
-    if (errline > 0)
-        BIO_printf(bio_err, "Error on line %ld of config file '%s'\n",
-                   errline, genconf);
-    else
-        BIO_printf(bio_err, "Error loading config file '%s'\n", genconf);
-

  err:
     NCONF_free(cnf);
     ASN1_TYPE_free(atyp);
  err:
     NCONF_free(cnf);
     ASN1_TYPE_free(atyp);

-

     return -1;
     return -1;

-

 }
 }