Skip a PHA test if Net::SSLeay does not expose the PHA

This commit is contained in:
Petr Písař 2019-06-17 09:35:43 +02:00
parent e271cbabf5
commit a2fab409c1
2 changed files with 21 additions and 15 deletions

View File

@ -1,4 +1,4 @@
From 921d3a471156896a0d139e82a50d07441992c811 Mon Sep 17 00:00:00 2001 From 6b05dc28e94e90ab4852c9977d7fbe66fec6cd48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Fri, 8 Feb 2019 14:50:32 +0100 Date: Fri, 8 Feb 2019 14:50:32 +0100
Subject: [PATCH] Test client performs Post-Handshake-Authentication Subject: [PATCH] Test client performs Post-Handshake-Authentication
@ -13,15 +13,15 @@ port. So the test can fail.
Signed-off-by: Petr Písař <ppisar@redhat.com> Signed-off-by: Petr Písař <ppisar@redhat.com>
--- ---
MANIFEST | 1 + MANIFEST | 1 +
t/pha_client.t | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++ t/pha_client.t | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 88 insertions(+) 2 files changed, 91 insertions(+)
create mode 100755 t/pha_client.t create mode 100755 t/pha_client.t
diff --git a/MANIFEST b/MANIFEST diff --git a/MANIFEST b/MANIFEST
index 5c2b87c..e46f919 100644 index 20cddb6..2b8328d 100644
--- a/MANIFEST --- a/MANIFEST
+++ b/MANIFEST +++ b/MANIFEST
@@ -57,6 +57,7 @@ t/memleak_bad_handshake.t @@ -57,6 +57,7 @@ t/mitm.t
t/multiple-cert-rsa-ecc.t t/multiple-cert-rsa-ecc.t
t/nonblock.t t/nonblock.t
t/npn.t t/npn.t
@ -31,22 +31,25 @@ index 5c2b87c..e46f919 100644
t/public_suffix_lib_encode_idn.t t/public_suffix_lib_encode_idn.t
diff --git a/t/pha_client.t b/t/pha_client.t diff --git a/t/pha_client.t b/t/pha_client.t
new file mode 100755 new file mode 100755
index 0000000..6699443 index 0000000..2413588
--- /dev/null --- /dev/null
+++ b/t/pha_client.t +++ b/t/pha_client.t
@@ -0,0 +1,87 @@ @@ -0,0 +1,90 @@
+#!/usr/bin/perl +#!/usr/bin/perl
+use strict; +use strict;
+use warnings; +use warnings;
+use Test::More; +use Test::More;
+use IPC::Run (); +use IPC::Run ();
+use IO::Socket::SSL (); +use IO::Socket::SSL ();
+use Net::SSLeay ();
+use IO::Select (); +use IO::Select ();
+ +
+if (!system('openssl', 'version')) { +if (system('openssl', 'version')) {
+ plan tests => 5;
+} else {
+ plan skip_all => 'openssl tool is not available'; + plan skip_all => 'openssl tool is not available';
+} elsif (!defined &Net::SSLeay::CTX_set_post_handshake_auth) {
+ plan skip_all => 'Net::SSLeay does not expose PHA';
+} else {
+ plan tests => 5;
+} +}
+ +
+my $port = 2000; +my $port = 2000;
@ -123,5 +126,5 @@ index 0000000..6699443
+ok(!$@, 'Server terminated'); +ok(!$@, 'Server terminated');
+ +
-- --
2.17.2 2.20.1

View File

@ -1,6 +1,6 @@
Name: perl-IO-Socket-SSL Name: perl-IO-Socket-SSL
Version: 2.066 Version: 2.066
Release: 2%{?dist} Release: 3%{?dist}
Summary: Perl library for transparent SSL Summary: Perl library for transparent SSL
License: GPL+ or Artistic License: GPL+ or Artistic
URL: https://metacpan.org/release/IO-Socket-SSL URL: https://metacpan.org/release/IO-Socket-SSL
@ -9,7 +9,7 @@ Patch0: IO-Socket-SSL-2.066-use-system-default-cipher-list.patch
Patch1: IO-Socket-SSL-2.066-use-system-default-SSL-version.patch Patch1: IO-Socket-SSL-2.066-use-system-default-SSL-version.patch
# A test for Enable-Post-Handshake-Authentication-TLSv1.3-feature.patch, # A test for Enable-Post-Handshake-Authentication-TLSv1.3-feature.patch,
# bug #1632660, requires openssl tool # bug #1632660, requires openssl tool
Patch4: IO-Socket-SSL-2.063-Test-client-performs-Post-Handshake-Authentication.patch Patch2: IO-Socket-SSL-2.066-Test-client-performs-Post-Handshake-Authentication.patch
BuildArch: noarch BuildArch: noarch
# Module Build # Module Build
BuildRequires: coreutils BuildRequires: coreutils
@ -93,8 +93,8 @@ mod_perl.
# Use system-default SSL version too # Use system-default SSL version too
%patch1 %patch1
# Add test for PHA # Add a test for PHA
%patch4 -p1 %patch2 -p1
%build %build
NO_NETWORK_TESTING=1 perl Makefile.PL INSTALLDIRS=vendor NO_NETWORK_TESTING=1 perl Makefile.PL INSTALLDIRS=vendor
@ -121,6 +121,9 @@ make test
%{_mandir}/man3/IO::Socket::SSL::Utils.3* %{_mandir}/man3/IO::Socket::SSL::Utils.3*
%changelog %changelog
* Mon Jun 17 2019 Petr Pisar <ppisar@redhat.com> - 2.066-3
- Skip a PHA test if Net::SSLeay does not expose the PHA (bug #1632660)
* Fri May 31 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2.066-2 * Fri May 31 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2.066-2
- Perl 5.30 rebuild - Perl 5.30 rebuild