Commit f20aa0a6 authored by Konstantin Shemyak's avatar Konstantin Shemyak Committed by Bernd Edlinger
Browse files

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



A backport of #4997.
Fixes #4996.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarBernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/5021)
parent 508ff7f6

apps/cms.c

+6 −2
Original line number Diff line number Diff line
@@ -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;