Make "oneline" the default for nameopt
There's no reason why we should default to a output format that is
old, and confusing in some cases.
This affects the commands "ca", "crl", "req" and "x509".
Reviewed-by: Rich Salz <rsalz@openssl.org>
diff --git a/apps/ca.c b/apps/ca.c
index a0f9f79..0a8d7b7 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -325,7 +325,7 @@
ret = 0;
goto end;
case OPT_IN:
- req = 1;
+ req = 1;
infile = opt_arg();
break;
case OPT_OUT:
@@ -638,8 +638,10 @@
goto end;
}
default_op = 0;
- } else
+ } else {
+ nameopt = XN_FLAG_ONELINE;
ERR_clear_error();
+ }
f = NCONF_get_string(conf, section, ENV_CERTOPT);
diff --git a/apps/crl.c b/apps/crl.c
index c897335..b4c9c75 100644
--- a/apps/crl.c
+++ b/apps/crl.c
@@ -114,6 +114,7 @@
EVP_PKEY *pkey;
const EVP_MD *digest = EVP_sha1();
unsigned long nmflag = 0;
+ char nmflag_set = 0;
char *infile = NULL, *outfile = NULL, *crldiff = NULL, *keyfile = NULL;
char *CAfile = NULL, *CApath = NULL, *prog;
OPTION_CHOICE o;
@@ -206,6 +207,7 @@
badsig = 1;
break;
case OPT_NAMEOPT:
+ nmflag_set = 1;
if (!set_name_ex(&nmflag, opt_arg()))
goto opthelp;
break;
@@ -217,6 +219,9 @@
argc = opt_num_rest();
argv = opt_rest();
+ if (!nmflag_set)
+ nmflag = XN_FLAG_ONELINE;
+
if (!app_load_modules(NULL))
goto end;
diff --git a/apps/req.c b/apps/req.c
index 03736cc..b3220ba 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -211,6 +211,7 @@
int nodes = 0, kludge = 0, newhdr = 0, subject = 0, pubkey = 0;
long newkey = -1;
unsigned long chtype = MBSTRING_ASC, nmflag = 0, reqflag = 0;
+ char nmflag_set = 0;
#ifndef OPENSSL_NO_DES
cipher = EVP_des_ede3_cbc();
@@ -323,6 +324,7 @@
chtype = MBSTRING_UTF8;
break;
case OPT_NAMEOPT:
+ nmflag_set = 1;
if (!set_name_ex(&nmflag, opt_arg()))
goto opthelp;
break;
@@ -352,7 +354,7 @@
goto opthelp;
break;
case OPT_SUBJECT:
- subject = 1;
+ subject = 1;
break;
case OPT_SUBJ:
subj = opt_arg();
@@ -375,6 +377,10 @@
}
argc = opt_num_rest();
argv = opt_rest();
+
+ if (!nmflag_set)
+ nmflag = XN_FLAG_ONELINE;
+
private = newreq && (pkey == NULL) ? 1 : 0;
if (!app_passwd(passargin, passargout, &passin, &passout)) {
diff --git a/apps/x509.c b/apps/x509.c
index 8293a6e..18e13e7 100644
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -227,6 +227,7 @@
int text = 0, serial = 0, subject = 0, issuer = 0, startdate = 0;
int checkoffset = 0, enddate = 0;
unsigned long nmflag = 0, certflag = 0;
+ char nmflag_set = 0;
OPTION_CHOICE o;
ENGINE *e = NULL;
#ifndef OPENSSL_NO_MD5
@@ -360,6 +361,7 @@
goto opthelp;
break;
case OPT_NAMEOPT:
+ nmflag_set = 1;
if (!set_name_ex(&nmflag, opt_arg()))
goto opthelp;
break;
@@ -488,6 +490,9 @@
goto opthelp;
}
+ if (!nmflag_set)
+ nmflag = XN_FLAG_ONELINE;
+
if (!app_load_modules(NULL))
goto end;
