diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2021-08-27 07:11:36 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <dev@ddvo.net> | 2021-09-30 15:08:21 +0200 |
| commit | 8dc0b2b55db38c67f907a856c240227ae2283a07 (patch) | |
| tree | 30c9169a15f0afcd37dc7defe7bbb696fc5a3d39 /apps/x509.c | |
| parent | d31e951aa496abbc88770e226ec46d8eb77dedad (diff) | |
APPS/{x509,req}: Fix description and diagnostics of -key, -in, etc. options
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16618)
Diffstat (limited to 'apps/x509.c')
| -rw-r--r-- | apps/x509.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/x509.c b/apps/x509.c index 7236972c5b..3f0e2630f1 100644 --- a/apps/x509.c +++ b/apps/x509.c @@ -61,7 +61,7 @@ const OPTIONS x509_options[] = { {"help", OPT_HELP, '-', "Display this summary"}, {"in", OPT_IN, '<', - "Certificate input (default stdin), or CSR input file with -req"}, + "Certificate input, or CSR input file with -req (default stdin)"}, {"passin", OPT_PASSIN, 's', "Private key and cert file pass-phrase source"}, {"new", OPT_NEW, '-', "Generate a certificate from scratch"}, {"x509toreq", OPT_X509TOREQ, '-', @@ -73,7 +73,7 @@ const OPTIONS x509_options[] = { "CSR input file format (DER or PEM) - default PEM"}, {"vfyopt", OPT_VFYOPT, 's', "CSR verification parameter in n:v form"}, {"key", OPT_KEY, 's', - "Key to be used in certificate or cert request"}, + "Key for signing, and to include unless using -force_pubkey"}, {"signkey", OPT_SIGNKEY, 's', "Same as -key"}, {"keyform", OPT_KEYFORM, 'E', @@ -630,7 +630,7 @@ int x509_main(int argc, char **argv) } if (privkeyfile == NULL && pubkeyfile == NULL) { BIO_printf(bio_err, - "The -new option without -key requires using -force_pubkey\n"); + "The -new option requires using the -key or -force_pubkey option\n"); goto end; } } @@ -642,7 +642,7 @@ int x509_main(int argc, char **argv) CAkeyfile = CAfile; if (CAfile != NULL) { if (privkeyfile != NULL) { - BIO_printf(bio_err, "Cannot use both -key and -CA option\n"); + BIO_printf(bio_err, "Cannot use both -key/-signkey and -CA option\n"); goto end; } } else if (CAkeyfile != NULL) { @@ -819,7 +819,7 @@ int x509_main(int argc, char **argv) if (x509toreq) { /* also works in conjunction with -req */ if (privkey == NULL) { - BIO_printf(bio_err, "Must specify request key using -key\n"); + BIO_printf(bio_err, "Must specify request signing key using -key\n"); goto end; } if (clrext && ext_copy != EXT_COPY_NONE) { |