Permalink
Browse files

Corrected 'cms' exit status when key or certificate cannot be opened

Fixes #4996.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from #4997)
  • Loading branch information...
KonstantinShemyak authored and bernd-edlinger committed Dec 28, 2017
1 parent ae880ae commit a032ed0a7ba3a276fe7d9880d26c0c5f2ba702c7
Showing with 6 additions and 2 deletions.
  1. +6 −2 apps/cms.c
View
@@ -921,11 +921,15 @@ int cms_main(int argc, char **argv)
keyfile = sk_OPENSSL_STRING_value(skkeys, i);
signer = load_cert(signerfile, FORMAT_PEM, "signer certificate");
if (signer == NULL)
if (signer == NULL) {
ret = 2;
goto end;
}
key = load_key(keyfile, keyform, 0, passin, e, "signing key file");
if (key == NULL)
if (key == NULL) {
ret = 2;
goto end;
}
for (kparam = key_first; kparam; kparam = kparam->next) {
if (kparam->idx == i) {
tflags |= CMS_KEY_PARAM;

0 comments on commit a032ed0

Please sign in to comment.