From: Konstantin Shemyak <konstantin@shemyak.com>
Date: Thu, 28 Dec 2017 21:12:59 +0000 (+0200)
Subject: Corrected 'cms' exit status when key or certificate cannot be opened
X-Git-Tag: OpenSSL_1_1_0h~148
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f20aa0a6e91f25dccfbaeeba9ad8f2f6800d7bc4;p=oweals%2Fopenssl.git

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

A backport of #4997.
Fixes #4996.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/5021)
---

diff --git a/apps/cms.c b/apps/cms.c
index 579b227301..7246658f91 100644
--- a/apps/cms.c
+++ b/apps/cms.c
@@ -931,11 +931,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)
+            if (!signer) {
+                ret = 2;
                 goto end;
+            }
             key = load_key(keyfile, keyform, 0, passin, e, "signing key file");
-            if (!key)
+            if (!key) {
+                ret = 2;
                 goto end;
+            }
             for (kparam = key_first; kparam; kparam = kparam->next) {
                 if (kparam->idx == i) {
                     tflags |= CMS_KEY_PARAM;