projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modernise ERR_print_errors_cb()
[openssl.git]
/
apps
/
cms.c
diff --git
a/apps/cms.c
b/apps/cms.c
index b2037b4df2bf4d53f22cf4d0206f938d191f28f6..9c9f01d3ee7304db2e27c537aae74c73bb3673fe 100644
(file)
--- a/
apps/cms.c
+++ b/
apps/cms.c
@@
-603,6
+603,14
@@
int cms_main(int argc, char **argv)
goto opthelp;
}
goto opthelp;
}
+ if (flags & CMS_CADES) {
+ if (flags & CMS_NOATTR) {
+ BIO_puts(bio_err, "Incompatible options: "
+ "CAdES required signed attributes\n");
+ goto opthelp;
+ }
+ }
+
if (operation & SMIME_SIGNERS) {
if (keyfile != NULL && signerfile == NULL) {
BIO_puts(bio_err, "Illegal -inkey without -signer\n");
if (operation & SMIME_SIGNERS) {
if (keyfile != NULL && signerfile == NULL) {
BIO_puts(bio_err, "Illegal -inkey without -signer\n");
@@
-640,6
+648,7
@@
int cms_main(int argc, char **argv)
goto opthelp;
}
} else if (!operation) {
goto opthelp;
}
} else if (!operation) {
+ BIO_printf(bio_err, "No operation option (-encrypt|-decrypt|-sign|-verify|...) specified.\n");
goto opthelp;
}
goto opthelp;
}