[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  80889e41a72ea2520959505537f38343958b761a (commit)
      from  5810bbd8c71003d7644fe802ff233a0d2a7f6778 (commit)


- Log -----------------------------------------------------------------
commit 80889e41a72ea2520959505537f38343958b761a
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Mar 12 11:36:08 2019 +0000

    Fix no-dso
    
    Don't try to load external provider modules in tests if we don't have DSO
    capability
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/8459)

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

Summary of changes:
 test/provider_internal_test.c |  9 +++++++--
 test/provider_test.c          | 12 +++++++++---
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/test/provider_internal_test.c b/test/provider_internal_test.c
index 8ce382e..ca554b8 100644
--- a/test/provider_internal_test.c
+++ b/test/provider_internal_test.c
@@ -11,6 +11,11 @@
 #include "internal/provider.h"
 #include "testutil.h"
 
+#if !defined(DSO_VMS) && !defined(DSO_DLCFN) && !defined(DSO_DL) \
+    && !defined(DSO_WIN32) && !defined(DSO_DLFCN)
+# define OPENSSL_NO_DSO
+#endif
+
 extern OSSL_provider_init_fn PROVIDER_INIT_FUNCTION_NAME;
 
 static char buf[256];
@@ -56,7 +61,7 @@ static int test_builtin_provider(void)
         && test_provider(prov);
 }
 
-#ifndef OPENSSL_NO_SHARED
+#ifndef OPENSSL_NO_DSO
 static int test_loaded_provider(void)
 {
     const char *name = "p_test";
@@ -71,7 +76,7 @@ static int test_loaded_provider(void)
 int setup_tests(void)
 {
     ADD_TEST(test_builtin_provider);
-#ifndef OPENSSL_NO_SHARED
+#ifndef OPENSSL_NO_DSO
     ADD_TEST(test_loaded_provider);
 #endif
     return 1;
diff --git a/test/provider_test.c b/test/provider_test.c
index 250eea3..eefafcf 100644
--- a/test/provider_test.c
+++ b/test/provider_test.c
@@ -11,6 +11,12 @@
 #include <openssl/provider.h>
 #include "testutil.h"
 
+#if !defined(DSO_VMS) && !defined(DSO_DLCFN) && !defined(DSO_DL) \
+    && !defined(DSO_WIN32) && !defined(DSO_DLFCN)
+# define OPENSSL_NO_DSO
+#endif
+
+
 extern OSSL_provider_init_fn PROVIDER_INIT_FUNCTION_NAME;
 
 static char buf[256];
@@ -45,11 +51,11 @@ static int test_builtin_provider(void)
 
     return
         TEST_true(OSSL_PROVIDER_add_builtin(NULL, name,
-					    PROVIDER_INIT_FUNCTION_NAME))
+                                            PROVIDER_INIT_FUNCTION_NAME))
         && test_provider(name);
 }
 
-#ifndef OPENSSL_NO_SHARED
+#ifndef OPENSSL_NO_DSO
 static int test_loaded_provider(void)
 {
     const char *name = "p_test";
@@ -61,7 +67,7 @@ static int test_loaded_provider(void)
 int setup_tests(void)
 {
     ADD_TEST(test_builtin_provider);
-#ifndef OPENSSL_NO_SHARED
+#ifndef OPENSSL_NO_DSO
     ADD_TEST(test_loaded_provider);
 #endif
     return 1;