Commit 80889e41 authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix no-dso 



Don't try to load external provider modules in tests if we don't have DSO
capability

Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8459)
parent 5810bbd8

test/provider_internal_test.c

+7 −2
Original line number Diff line number Diff line
@@ -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;

test/provider_test.c

+9 −3
Original line number Diff line number Diff line
@@ -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];
@@ -49,7 +55,7 @@ static int test_builtin_provider(void) 
        && 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;