For provider tests, don't define a OPENSSL_NO_ macro

[openssl.git] / test / provider_test.c

diff --git a/test/provider_test.c b/test/provider_test.c
index eefafcf5d5143ac5df61be202a2e6fe2ec008295..c00f5ab4eba73dd3ed82e846e637ad989a7caa98 100644 (file)
--- a/test/provider_test.c
+++ b/test/provider_test.c
@@ -11,12 +11,6 @@
 #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];
@@ -32,9 +26,9 @@ static int test_provider(const char *name)
     const char *greeting = NULL;
     char expected_greeting[256];
 
-    snprintf(expected_greeting, sizeof(expected_greeting),
-             "Hello OpenSSL %.20s, greetings from %s!",
-             OPENSSL_VERSION_STR, name);
+    BIO_snprintf(expected_greeting, sizeof(expected_greeting),
+                 "Hello OpenSSL %.20s, greetings from %s!",
+                 OPENSSL_VERSION_STR, name);
 
     return
         TEST_ptr(prov = OSSL_PROVIDER_load(NULL, name))
@@ -55,7 +49,7 @@ static int test_builtin_provider(void)
         && test_provider(name);
 }
 
-#ifndef OPENSSL_NO_DSO
+#ifndef NO_PROVIDER_MODULE
 static int test_loaded_provider(void)
 {
     const char *name = "p_test";
@@ -67,7 +61,7 @@ static int test_loaded_provider(void)
 int setup_tests(void)
 {
     ADD_TEST(test_builtin_provider);
-#ifndef OPENSSL_NO_DSO
+#ifndef NO_PROVIDER_MODULE
     ADD_TEST(test_loaded_provider);
 #endif
     return 1;