You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
85 lines
2.8 KiB
85 lines
2.8 KiB
From ec8e4e25cc5e5c67313c5fd6af94fa248685c3d1 Mon Sep 17 00:00:00 2001 |
|
From: Dmitry Belyavskiy <dbelyavs@redhat.com> |
|
Date: Thu, 7 Mar 2024 17:37:09 +0100 |
|
Subject: [PATCH 45/49] 0115-skip-quic-pairwise.patch |
|
|
|
Patch-name: 0115-skip-quic-pairwise.patch |
|
Patch-id: 115 |
|
Patch-status: | |
|
# skip quic and pairwise tests temporarily |
|
--- |
|
test/quicapitest.c | 4 +++- |
|
test/recipes/01-test_symbol_presence.t | 1 + |
|
test/recipes/30-test_pairwise_fail.t | 10 ++++++++-- |
|
3 files changed, 12 insertions(+), 3 deletions(-) |
|
|
|
diff --git a/test/quicapitest.c b/test/quicapitest.c |
|
index 41cf0fc7a8..0fb7492700 100644 |
|
--- a/test/quicapitest.c |
|
+++ b/test/quicapitest.c |
|
@@ -2139,7 +2139,9 @@ int setup_tests(void) |
|
ADD_TEST(test_cipher_find); |
|
ADD_TEST(test_version); |
|
#if defined(DO_SSL_TRACE_TEST) |
|
- ADD_TEST(test_ssl_trace); |
|
+ if (is_fips == 0) { |
|
+ ADD_TEST(test_ssl_trace); |
|
+ } |
|
#endif |
|
ADD_TEST(test_quic_forbidden_apis_ctx); |
|
ADD_TEST(test_quic_forbidden_apis); |
|
diff --git a/test/recipes/30-test_pairwise_fail.t b/test/recipes/30-test_pairwise_fail.t |
|
index c837d48fb4..6291c08c49 100644 |
|
--- a/test/recipes/30-test_pairwise_fail.t |
|
+++ b/test/recipes/30-test_pairwise_fail.t |
|
@@ -9,7 +9,7 @@ |
|
use strict; |
|
use warnings; |
|
|
|
-use OpenSSL::Test qw(:DEFAULT bldtop_dir srctop_file srctop_dir data_file); |
|
+use OpenSSL::Test qw(:DEFAULT bldtop_dir srctop_file srctop_dir data_file with); |
|
use OpenSSL::Test::Utils; |
|
|
|
BEGIN { |
|
@@ -31,28 +31,37 @@ run(test(["fips_version_test", "-config" |
|
SKIP: { |
|
skip "Skip RSA test because of no rsa in this build", 1 |
|
if disabled("rsa"); |
|
+ with({ exit_checker => sub {my $val = shift; return $val == 134; } }, |
|
+ sub { |
|
ok(run(test(["pairwise_fail_test", "-config", $provconf, |
|
"-pairwise", "rsa"])), |
|
"fips provider rsa keygen pairwise failure test"); |
|
+ }); |
|
} |
|
|
|
SKIP: { |
|
skip "Skip EC test because of no ec in this build", 2 |
|
if disabled("ec"); |
|
+ with({ exit_checker => sub {my $val = shift; return $val == 134; } }, |
|
+ sub { |
|
ok(run(test(["pairwise_fail_test", "-config", $provconf, |
|
"-pairwise", "ec"])), |
|
"fips provider ec keygen pairwise failure test"); |
|
+ }); |
|
|
|
skip "FIPS provider version is too old", 1 |
|
if !$fips_exit; |
|
+ with({ exit_checker => sub {my $val = shift; return $val == 134; } }, |
|
+ sub { |
|
ok(run(test(["pairwise_fail_test", "-config", $provconf, |
|
"-pairwise", "eckat"])), |
|
"fips provider ec keygen kat failure test"); |
|
+ }); |
|
} |
|
|
|
SKIP: { |
|
skip "Skip DSA tests because of no dsa in this build", 2 |
|
- if disabled("dsa"); |
|
+ if 1; #if disabled("dsa"); |
|
ok(run(test(["pairwise_fail_test", "-config", $provconf, |
|
"-pairwise", "dsa", "-dsaparam", data_file("dsaparam.pem")])), |
|
"fips provider dsa keygen pairwise failure test"); |
|
-- |
|
2.44.0 |
|
|
|
|