[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  547a19cf4fcb581bd0c310bd69141031c7118295 (commit)
       via  9e64457d1ed6200228a930ab14c5c5e68a666d1e (commit)
      from  5fc2c6896d5050735c7d99dc80275c72fc58c49c (commit)


- Log -----------------------------------------------------------------
commit 547a19cf4fcb581bd0c310bd69141031c7118295
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jul 19 09:17:09 2016 +0200

    VMS: have the IVP verify that a well known engine loads properly
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 9e64457d1ed6200228a930ab14c5c5e68a666d1e
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jul 19 08:57:01 2016 +0200

    Have 'openssl engine' exit with non-zero when some engine fails to load
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 VMS/openssl_ivp.com.in | 10 ++++++++++
 apps/engine.c          |  8 ++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/VMS/openssl_ivp.com.in b/VMS/openssl_ivp.com.in
index 3555bf6..a4c67b2 100644
--- a/VMS/openssl_ivp.com.in
+++ b/VMS/openssl_ivp.com.in
@@ -32,9 +32,19 @@ $	    WRITE SYS$ERROR "Installation inconsistent"
 $	    EXIT %x00018292 ! RMS$_FNF, file not found
 $	ENDIF
 $
+$	ON ERROR THEN GOTO error
+$
 $	! If something else is wrong with the installation, we're likely
 $	! to get an image activation error here
 $	openssl version -a
 $
+$	! Verify that engines are where they should be.
+$	openssl engine -c -t dasync
+$
 $	WRITE SYS$ERROR "OpenSSL IVP passed"
 $	EXIT %x10000001
+$
+$ error:
+$	save_status = $STATUS
+$	WRITE SYS$ERROR "OpenSSL IVP failed"
+$	EXIT 'save_status'
diff --git a/apps/engine.c b/apps/engine.c
index c98839a..ffd3137 100644
--- a/apps/engine.c
+++ b/apps/engine.c
@@ -342,6 +342,7 @@ int engine_main(int argc, char **argv)
         }
     }
 
+    ret = 0;
     for (i = 0; i < sk_OPENSSL_CSTRING_num(engines); i++) {
         const char *id = sk_OPENSSL_CSTRING_value(engines, i);
         if ((e = ENGINE_by_id(id)) != NULL) {
@@ -424,11 +425,14 @@ int engine_main(int argc, char **argv)
             if ((verbose > 0) && !util_verbose(e, verbose, out, indent))
                 goto end;
             ENGINE_free(e);
-        } else
+        } else {
             ERR_print_errors(bio_err);
+            /* because exit codes above 127 have special meaning on Unix */
+            if (++ret > 127)
+                ret = 127;
+        }
     }
 
-    ret = 0;
  end:
 
     ERR_print_errors(bio_err);