wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix no-dso

Browse source 
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)
This commit is contained in:
Matt Caswell 2019-03-12 11:36:08 +00:00
parent 5810bbd8c7
commit 80889e41a7
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
test/provider_internal_test.c
View file

@ -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;

12
test/provider_test.c
View file

@ -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;