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@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8459)

diff --git a/test/provider_internal_test.c b/test/provider_internal_test.c
index 8ce382effa3c957a87f4495274dcb3706c996c05..ca554b893226d735ce193215ec192ad98d05c6f7 100644 (file)
--- 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 250eea39ecdd76bc033227b4c435aa4152a59417..eefafcf5d5143ac5df61be202a2e6fe2ec008295 100644 (file)
--- 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;