Commit f1cece55 authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarRich Salz <rsalz@openssl.org>
parent 5727582c

apps/ca.c

+4 −2
Original line number Diff line number Diff line
@@ -638,8 +638,10 @@ end_of_options: 
            goto end;

        }

        default_op = 0;

    } else

    } else {

        nameopt = XN_FLAG_ONELINE;

        ERR_clear_error();

    }



    f = NCONF_get_string(conf, section, ENV_CERTOPT);

apps/crl.c

+5 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ int crl_main(int argc, char **argv) 
    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 @@ int crl_main(int argc, char **argv) 
            badsig = 1;

            break;

        case OPT_NAMEOPT:

            nmflag_set = 1;

            if (!set_name_ex(&nmflag, opt_arg()))

                goto opthelp;

            break;
@@ -217,6 +219,9 @@ int crl_main(int argc, char **argv) 
    argc = opt_num_rest();

    argv = opt_rest();



    if (!nmflag_set)

        nmflag = XN_FLAG_ONELINE;



    if (!app_load_modules(NULL))

        goto end;

apps/req.c

+7 −1
Original line number Diff line number Diff line
@@ -211,6 +211,7 @@ int req_main(int argc, char **argv) 
    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 @@ int req_main(int argc, char **argv) 
            chtype = MBSTRING_UTF8;

            break;

        case OPT_NAMEOPT:

            nmflag_set = 1;

            if (!set_name_ex(&nmflag, opt_arg()))

                goto opthelp;

            break;
@@ -375,6 +377,10 @@ int req_main(int argc, char **argv) 
    }

    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)) {

apps/x509.c

+5 −0
Original line number Diff line number Diff line
@@ -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;