diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-09-02 13:52:23 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-09-10 12:07:33 +0200 |
| commit | 5a0991d0d94b966e0621b8123873b132877dc9d3 (patch) | |
| tree | c4fd5cd639741a863010a23472cfc005556610cd /apps/req.c | |
| parent | 5fdcde816f6ee9ef048977c14427e2b0b63f47b6 (diff) | |
Add/harmonize multi-valued RDN support and doc of ca, cmp, req, storeutl, and x509 apps
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/12769)
Diffstat (limited to 'apps/req.c')
| -rw-r--r-- | apps/req.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/req.c b/apps/req.c index 46739554bd..2cc9ebf43d 100644 --- a/apps/req.c +++ b/apps/req.c @@ -127,7 +127,7 @@ const OPTIONS req_options[] = { {"subj", OPT_SUBJ, 's', "Set or modify request subject"}, {"subject", OPT_SUBJECT, '-', "Output the request's subject"}, {"multivalue-rdn", OPT_MULTIVALUE_RDN, '-', - "Enable support for multivalued RDNs"}, + "Deprecated; multi-valued RDNs support is always on."}, {"days", OPT_DAYS, 'p', "Number of days cert is valid for"}, {"set_serial", OPT_SET_SERIAL, 's', "Serial number to use"}, {"addext", OPT_ADDEXT, 's', @@ -257,7 +257,7 @@ int req_main(int argc, char **argv) int ret = 1, x509 = 0, days = 0, i = 0, newreq = 0, verbose = 0; int pkey_type = -1, private = 0; int informat = FORMAT_PEM, outformat = FORMAT_PEM, keyform = FORMAT_PEM; - int modulus = 0, multirdn = 0, verify = 0, noout = 0, text = 0; + int modulus = 0, multirdn = 1, verify = 0, noout = 0, text = 0; int noenc = 0, newhdr = 0, subject = 0, pubkey = 0, precert = 0; long newkey = -1; unsigned long chtype = MBSTRING_ASC, reqflag = 0; @@ -421,7 +421,7 @@ int req_main(int argc, char **argv) subj = opt_arg(); break; case OPT_MULTIVALUE_RDN: - multirdn = 1; + /* obsolete */ break; case OPT_ADDEXT: p = opt_arg(); |