mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-12-04 15:34:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Suppress a spurious error from the sysdefault test

Browse Source 
Running the sysdefault test results in spurious error output - even
though the test has actually passed

Fixes #24383

Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24384)
This commit is contained in:
Matt Caswell 2024-05-13 10:45:24 +01:00 committed by Tomas Mraz
parent ad3f28c5fb
commit 50153ad2bb
2 changed files with 48 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/recipes/90-test_sysdefault.t
View File

@ -24,7 +24,7 @@ ok(run(test(["sysdefaulttest"])), "sysdefaulttest");
$ENV{OPENSSL_CONF} = data_file("sysdefault-bad.cnf"); $ENV{OPENSSL_CONF} = data_file("sysdefault-bad.cnf");
ok(!run(test(["sysdefaulttest"])), "sysdefaulttest"); ok(run(test(["sysdefaulttest", "-f"])), "sysdefaulttest");
$ENV{OPENSSL_CONF} = data_file("sysdefault-ignore.cnf"); $ENV{OPENSSL_CONF} = data_file("sysdefault-ignore.cnf");

54
test/sysdefaulttest.c
View File

@ -16,19 +16,28 @@
#include <openssl/tls1.h> #include <openssl/tls1.h>
#include "testutil.h" #include "testutil.h"
static int expect_failure = 0;
static int test_func(void) static int test_func(void)
{ {
int ret = 1; int ret = 0;
SSL_CTX *ctx; SSL_CTX *ctx;
if (!TEST_ptr(ctx = SSL_CTX_new(TLS_method()))) ctx = SSL_CTX_new(TLS_method());
return 0; if (expect_failure) {
if (!TEST_int_eq(SSL_CTX_get_min_proto_version(ctx), TLS1_2_VERSION) if (!TEST_ptr_null(ctx))
&& !TEST_int_eq(SSL_CTX_get_max_proto_version(ctx), TLS1_2_VERSION)) { goto err;
TEST_info("min/max version setting incorrect"); } else {
ret = 0; if (!TEST_ptr(ctx))
return 0;
if (!TEST_int_eq(SSL_CTX_get_min_proto_version(ctx), TLS1_2_VERSION)
&& !TEST_int_eq(SSL_CTX_get_max_proto_version(ctx), TLS1_2_VERSION)) {
TEST_info("min/max version setting incorrect");
goto err;
}
} }
ret = 1;
err:
SSL_CTX_free(ctx); SSL_CTX_free(ctx);
return ret; return ret;
} }
@ -41,8 +50,39 @@ int global_init(void)
return 1; return 1;
} }
typedef enum OPTION_choice {
OPT_ERR = -1,
OPT_EOF = 0,
OPT_FAIL,
OPT_TEST_ENUM
} OPTION_CHOICE;
const OPTIONS *test_get_options(void)
{
static const OPTIONS test_options[] = {
OPT_TEST_OPTIONS_DEFAULT_USAGE,
{ "f", OPT_FAIL, '-', "A failure is expected" },
{ NULL }
};
return test_options;
}
int setup_tests(void) int setup_tests(void)
{ {
OPTION_CHOICE o;
while ((o = opt_next()) != OPT_EOF) {
switch (o) {
case OPT_FAIL:
expect_failure = 1;
break;
case OPT_TEST_CASES:
break;
default:
return 0;
}
}
ADD_TEST(test_func); ADD_TEST(test_func);
return 1; return 1;
} }