diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-08-28 15:03:11 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-09-11 12:17:58 +0200 |
| commit | 62261446b21be4dcdc75af81e07253b803ae57f9 (patch) | |
| tree | e9cec80c61f19f2e9e5ece0c8482d11c2e4bed76 /apps | |
| parent | 7a7d6b514fb2c95570896e512e165a38c9ecac46 (diff) | |
apps/cmp.c: Improve user guidance on missing -subject etc. options
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12825)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/cmp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/cmp.c b/apps/cmp.c index 9f1f115436..94404c92f3 100644 --- a/apps/cmp.c +++ b/apps/cmp.c @@ -1601,7 +1601,8 @@ static int setup_protection_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine) */ static int setup_request_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine) { - if (opt_subject == NULL && opt_oldcert == NULL && opt_cert == NULL) + if (opt_subject == NULL && opt_oldcert == NULL && opt_cert == NULL + && opt_cmd != CMP_RR && opt_cmd != CMP_GENM) CMP_warn("no -subject given, neither -oldcert nor -cert available as default"); if (!set_name(opt_subject, OSSL_CMP_CTX_set1_subjectName, ctx, "subject") || !set_name(opt_issuer, OSSL_CMP_CTX_set1_issuer, ctx, "issuer")) @@ -2954,5 +2955,5 @@ int cmp_main(int argc, char **argv) NCONF_free(conf); /* must not do as long as opt_... variables are used */ OSSL_CMP_log_close(); - return ret == 0 ? EXIT_FAILURE : EXIT_SUCCESS; + return ret == 0 ? EXIT_FAILURE : EXIT_SUCCESS; /* ret == -1 for -help */ } |