diff options
author | Richard Levitte <levitte@openssl.org> | 2015-07-07 11:13:20 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2015-07-07 11:17:14 +0200 |
commit | f1cece554ddf282f1512b4da04664467746ffd24 (patch) | |
tree | 1a3dd22c2dc43c19c2ac420c45e942953f5644df /apps/x509.c | |
parent | 5727582cf51e98e5e0faa435e7da2c8929533c0d (diff) | |
download | openssl-f1cece554ddf282f1512b4da04664467746ffd24.tar.gz |
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>
Diffstat (limited to 'apps/x509.c')
-rw-r--r-- | apps/x509.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/x509.c b/apps/x509.c index 8293a6e0f3..18e13e7921 100644 --- a/apps/x509.c +++ b/apps/x509.c @@ -227,6 +227,7 @@ int x509_main(int argc, char **argv) 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 @@ int x509_main(int argc, char **argv) goto opthelp; break; case OPT_NAMEOPT: + nmflag_set = 1; if (!set_name_ex(&nmflag, opt_arg())) goto opthelp; break; @@ -488,6 +490,9 @@ int x509_main(int argc, char **argv) goto opthelp; } + if (!nmflag_set) + nmflag = XN_FLAG_ONELINE; + if (!app_load_modules(NULL)) goto end; |