b0cff60812
Resolves: RHEL-80854 Resolves: RHEL-50208 Resolves: RHEL-50210 Resolves: RHEL-50211 Resolves: RHEL-85954
87 lines
3.0 KiB
Diff
87 lines
3.0 KiB
Diff
From 2f327785a69b62eac55a94d49441994cbaf941d5 Mon Sep 17 00:00:00 2001
|
|
From: Dmitry Belyavskiy <dbelyavs@redhat.com>
|
|
Date: Thu, 7 Mar 2024 17:37:09 +0100
|
|
Subject: [PATCH 12/50] RH: skip quic pairwise
|
|
|
|
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 38dd42c184..b2e18522ab 100644
|
|
--- a/test/quicapitest.c
|
|
+++ b/test/quicapitest.c
|
|
@@ -2761,7 +2761,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/01-test_symbol_presence.t b/test/recipes/01-test_symbol_presence.t
|
|
index 222b1886ae..7e2f65cccb 100644
|
|
--- a/test/recipes/01-test_symbol_presence.t
|
|
+++ b/test/recipes/01-test_symbol_presence.t
|
|
@@ -185,6 +185,7 @@ foreach (sort keys %stlibname) {
|
|
}
|
|
}
|
|
my @duplicates = sort grep { $symbols{$_} > 1 } keys %symbols;
|
|
+@duplicates = grep {($_ ne "OPENSSL_ia32cap_P") && ($_ ne "EVP_CIPHER_CTX_dup") && ($_ ne "EVP_MD_CTX_dup") } @duplicates;
|
|
if (@duplicates) {
|
|
note "Duplicates:";
|
|
note join('\n', @duplicates);
|
|
diff --git a/test/recipes/30-test_pairwise_fail.t b/test/recipes/30-test_pairwise_fail.t
|
|
index a101a26fb1..43e5396766 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 {
|
|
@@ -39,20 +39,26 @@ SKIP: {
|
|
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.49.0
|
|
|