Add 'openssl req' option to specify extension values on command line

[openssl.git] / apps / apps.c

diff --git a/apps/apps.c b/apps/apps.c
index 30405662571ddf9573592d129f1903a5c89f2c86..834cedd5a33db8f623301cce115e0648f59de605 100644 (file)
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -442,7 +442,7 @@ static char *app_get_pass(const char *arg, int keepbio)
     return OPENSSL_strdup(tpass);
 }
 
     return OPENSSL_strdup(tpass);
 }
 

-static CONF *app_load_config_(BIO *in, const char *filename)
+CONF *app_load_config_bio(BIO *in, const char *filename)

 {
     long errorline = -1;
     CONF *conf;
 {
     long errorline = -1;
     CONF *conf;


@@ -453,12 +453,17 @@ static CONF *app_load_config_(BIO *in, const char *filename)
     if (i > 0)
         return conf;
 
     if (i > 0)
         return conf;
 

-    if (errorline <= 0)
-        BIO_printf(bio_err, "%s: Can't load config file \"%s\"\n",
-                   opt_getprog(), filename);
+    if (errorline <= 0) {
+        BIO_printf(bio_err, "%s: Can't load ", opt_getprog());
+    } else {
+        BIO_printf(bio_err, "%s: Error on line %ld of ", opt_getprog(),
+                   errorline);
+    }
+    if (filename != NULL)
+        BIO_printf(bio_err, "config file \"%s\"\n", filename);

     else
     else

-        BIO_printf(bio_err, "%s: Error on line %ld of config file \"%s\"\n",
-                   opt_getprog(), errorline, filename);
+        BIO_printf(bio_err, "config input");
+

     NCONF_free(conf);
     return NULL;
 }
     NCONF_free(conf);
     return NULL;
 }


@@ -472,7 +477,7 @@ CONF *app_load_config(const char *filename)
     if (in == NULL)
         return NULL;
 
     if (in == NULL)
         return NULL;
 

-    conf = app_load_config_(in, filename);
+    conf = app_load_config_bio(in, filename);

     BIO_free(in);
     return conf;
 }
     BIO_free(in);
     return conf;
 }


@@ -486,7 +491,7 @@ CONF *app_load_config_quiet(const char *filename)
     if (in == NULL)
         return NULL;
 
     if (in == NULL)
         return NULL;
 

-    conf = app_load_config_(in, filename);
+    conf = app_load_config_bio(in, filename);

     BIO_free(in);
     return conf;
 }
     BIO_free(in);
     return conf;
 }