Commit 521b7cb3 authored by Richard Levitte's avatar Richard Levitte
Browse files

Correct the checks of module availability in provider test programs 



Previously, the macro OPENSSL_NO_SHARED was defined of the test/p_test
module wasn't built, but the provider test programs didn't check that
macro.  We rename it to OPENSSL_NO_MODULE, since that name describes
the situation more than OPENSSL_NO_SHARED does, and use it.

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

test/build.info

+4 −3
Original line number Diff line number Diff line
@@ -611,9 +611,10 @@ IF[{- !$disabled{tests} -}] 
      SOURCE[p_test]=p_test.ld

      GENERATE[p_test.ld]=../util/providers.num

    ENDIF

  ELSE

    DEFINE[provider_test]=OPENSSL_NO_SHARED

    DEFINE[provider_internal_test]=OPENSSL_NO_SHARED

  ENDIF

  IF[{- $disabled{module} || !$target{dso_scheme} -}]

    DEFINE[provider_test]=OPENSSL_NO_MODULE

    DEFINE[provider_internal_test]=OPENSSL_NO_MODULE

  ENDIF



  PROGRAMS{noinst}=params_test

test/provider_internal_test.c

+2 −7
Original line number Diff line number Diff line
@@ -11,11 +11,6 @@ 
#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];
@@ -61,7 +56,7 @@ static int test_builtin_provider(void) 
        && test_provider(prov);

}



#ifndef OPENSSL_NO_DSO

#ifndef OPENSSL_NO_MODULE

static int test_loaded_provider(void)

{

    const char *name = "p_test";
@@ -76,7 +71,7 @@ static int test_loaded_provider(void) 
int setup_tests(void)

{

    ADD_TEST(test_builtin_provider);

#ifndef OPENSSL_NO_DSO

#ifndef OPENSSL_NO_MODULE

    ADD_TEST(test_loaded_provider);

#endif

    return 1;

test/provider_test.c

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

}



#ifndef OPENSSL_NO_DSO

#ifndef OPENSSL_NO_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 OPENSSL_NO_MODULE

    ADD_TEST(test_loaded_provider);

#endif

    return 1;