From a032ed0a7ba3a276fe7d9880d26c0c5f2ba702c7 Mon Sep 17 00:00:00 2001 From: Konstantin Shemyak Date: Thu, 28 Dec 2017 23:12:59 +0200 Subject: [PATCH] Corrected 'cms' exit status when key or certificate cannot be opened Fixes #4996. Reviewed-by: Matt Caswell Reviewed-by: Andy Polyakov (Merged from https://github.com/openssl/openssl/pull/4997) --- apps/cms.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/cms.c b/apps/cms.c index 1457cabee7..6900ddfe84 100644 --- a/apps/cms.c +++ b/apps/cms.c @@ -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;