[openssl-commits] [openssl] master update

[bernd.edlinger at hotmail.de]

The branch master has been updated
       via  a032ed0a7ba3a276fe7d9880d26c0c5f2ba702c7 (commit)
      from  ae880ae6719e7c850b14193b2bc0a8e401c4b2b8 (commit)


- Log -----------------------------------------------------------------
commit a032ed0a7ba3a276fe7d9880d26c0c5f2ba702c7
Author: Konstantin Shemyak <konstantin at shemyak.com>
Date:   Thu Dec 28 23:12:59 2017 +0200

    Corrected 'cms' exit status when key or certificate cannot be opened
    
    Fixes #4996.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4997)

-----------------------------------------------------------------------

Summary of changes:
 apps/cms.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/cms.c b/apps/cms.c
index 1457cab..6900ddf 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;