[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  46117d31fe420124dd07f8f16d7a76fecc290980 (commit)
      from  2238119751bb95efc1dfafabf0e70e86f71fc6f6 (commit)


- Log -----------------------------------------------------------------
commit 46117d31fe420124dd07f8f16d7a76fecc290980
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Aug 17 10:45:03 2016 +0200

    dasync is an internal testing engine, so don't install it
    
    Unfortunately, it means that the VMS IVP gets a bit crippled.  This
    will be fixed later on.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 VMS/openssl_ivp.com.in | 4 ++--
 engines/build.info     | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/VMS/openssl_ivp.com.in b/VMS/openssl_ivp.com.in
index a4c67b2..825a699 100644
--- a/VMS/openssl_ivp.com.in
+++ b/VMS/openssl_ivp.com.in
@@ -38,8 +38,8 @@ $	! 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
+$	! FUTURE ENHANCEMENT: Verify that engines are where they should be.
+$	! openssl engine -c -t checker
 $
 $	WRITE SYS$ERROR "OpenSSL IVP passed"
 $	EXIT %x10000001
diff --git a/engines/build.info b/engines/build.info
index 25917ff..1c47e77 100644
--- a/engines/build.info
+++ b/engines/build.info
@@ -2,14 +2,12 @@ IF[{- !$disabled{"engine"} -}]
   IF[{- $disabled{"dynamic-engine"} -}]
     LIBS=../libcrypto
     SOURCE[../libcrypto]=\
-            e_padlock.c {- $target{padlock_asm_src} -} \
-            e_dasync.c
+            e_padlock.c {- $target{padlock_asm_src} -}
     IF[{- !$disabled{capieng} -}]
       SOURCE[../libcrypto]=e_capi.c
     ENDIF
   ELSE
-    ENGINES=padlock dasync
-    ENGINES_NO_INST=ossltest
+    ENGINES=padlock
     SOURCE[padlock]=e_padlock.c {- $target{padlock_asm_src} -}
     DEPEND[padlock]=../libcrypto
     INCLUDE[padlock]=../include
@@ -19,6 +17,8 @@ IF[{- !$disabled{"engine"} -}]
       DEPEND[capi]=../libcrypto
       INCLUDE[capi]=../include
     ENDIF
+
+    ENGINES_NO_INST=ossltest dasync
     SOURCE[dasync]=e_dasync.c
     DEPEND[dasync]=../libcrypto
     INCLUDE[dasync]=../include