[openssl] master update
Richard Levitte
levitte at openssl.org
Thu Apr 4 11:40:14 UTC 2019
The branch master has been updated
via 2a2bc6fc12c6f6fc47c7c66dd4d0e3ef4be17777 (commit)
from 706b6333a6dd29a8d11561dee8013a2fddbc2742 (commit)
- Log -----------------------------------------------------------------
commit 2a2bc6fc12c6f6fc47c7c66dd4d0e3ef4be17777
Author: Richard Levitte <levitte at openssl.org>
Date: Thu Apr 4 12:35:47 2019 +0200
For provider tests, don't define a OPENSSL_NO_ macro
Since the macro to indicate if the test provider module is available
is local to the test programs, it's better to use a name that isn't
as easily confused with a library feature disabling macro that one
would expect to find in opensslconf.h.
Reviewed-by: Matt Caswell <matt at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8664)
-----------------------------------------------------------------------
Summary of changes:
test/build.info | 4 ++--
test/provider_internal_test.c | 4 ++--
test/provider_test.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/test/build.info b/test/build.info
index 25abb06..8bf286e 100644
--- a/test/build.info
+++ b/test/build.info
@@ -613,8 +613,8 @@ IF[{- !$disabled{tests} -}]
ENDIF
ENDIF
IF[{- $disabled{module} || !$target{dso_scheme} -}]
- DEFINE[provider_test]=OPENSSL_NO_MODULE
- DEFINE[provider_internal_test]=OPENSSL_NO_MODULE
+ DEFINE[provider_test]=NO_PROVIDER_MODULE
+ DEFINE[provider_internal_test]=NO_PROVIDER_MODULE
ENDIF
DEPEND[]=provider_internal_test.conf
GENERATE[provider_internal_test.conf]=provider_internal_test.conf.in
diff --git a/test/provider_internal_test.c b/test/provider_internal_test.c
index f3006fe..6123d6b 100644
--- a/test/provider_internal_test.c
+++ b/test/provider_internal_test.c
@@ -60,7 +60,7 @@ static int test_builtin_provider(void)
&& test_provider(prov, expected_greeting1(name));
}
-#ifndef OPENSSL_NO_MODULE
+#ifndef NO_PROVIDER_MODULE
static int test_loaded_provider(void)
{
const char *name = "p_test";
@@ -89,7 +89,7 @@ static int test_configured_provider(void)
int setup_tests(void)
{
ADD_TEST(test_builtin_provider);
-#ifndef OPENSSL_NO_MODULE
+#ifndef NO_PROVIDER_MODULE
ADD_TEST(test_loaded_provider);
ADD_TEST(test_configured_provider);
#endif
diff --git a/test/provider_test.c b/test/provider_test.c
index ee6f94c..c00f5ab 100644
--- a/test/provider_test.c
+++ b/test/provider_test.c
@@ -49,7 +49,7 @@ static int test_builtin_provider(void)
&& test_provider(name);
}
-#ifndef OPENSSL_NO_MODULE
+#ifndef NO_PROVIDER_MODULE
static int test_loaded_provider(void)
{
const char *name = "p_test";
@@ -61,7 +61,7 @@ static int test_loaded_provider(void)
int setup_tests(void)
{
ADD_TEST(test_builtin_provider);
-#ifndef OPENSSL_NO_MODULE
+#ifndef NO_PROVIDER_MODULE
ADD_TEST(test_loaded_provider);
#endif
return 1;
More information about the openssl-commits
mailing list