Fix failing test with openssl-1.0.1h (upstream commit 414, CPAN RT#96256)

This commit is contained in:
Paul Howarth 2014-06-08 14:06:13 +01:00
parent 5d034c2ee5
commit 7fa37f8470
2 changed files with 36 additions and 3 deletions

View File

@ -0,0 +1,26 @@
Index: t/local/33_x509_create_cert.t
===================================================================
--- t/local/33_x509_create_cert.t (revision 413)
+++ t/local/33_x509_create_cert.t (revision 414)
@@ -2,7 +2,7 @@
use strict;
use warnings;
-use Test::More tests => 124;
+use Test::More tests => 123;
use Net::SSLeay qw/MBSTRING_ASC MBSTRING_UTF8 EVP_PK_RSA EVP_PKT_SIGN EVP_PKT_ENC/;
use File::Spec;
use utf8;
@@ -104,7 +104,11 @@
like(my $key_pem4 = Net::SSLeay::PEM_get_string_PrivateKey($pk,"password",$alg2), qr/-----BEGIN (ENCRYPTED|RSA) PRIVATE KEY-----/, "PEM_get_string_PrivateKey+passwd+enc_alg");
is(Net::SSLeay::X509_NAME_print_ex($name), "O=Company Name,C=UK,CN=Common name text X509", "X509_NAME_print_ex");
- is(unpack("H*",Net::SSLeay::X509_NAME_digest($name, $sha1_digest)), "044d7ea7fddced7b9b63799600b9989a63b36819", "X509_NAME_digest");
+
+ # 2014-06-06: Sigh, some versions of openssl have this patch, which afffects the results of this test:
+ # https://git.openssl.org/gitweb/?p=openssl.git;a=commit;h=3009244da47b989c4cc59ba02cf81a4e9d8f8431
+ # with this patch, the result is "ce83889f1beab8e70aa142e07e94b0ebbd9d59e0"
+# is(unpack("H*",Net::SSLeay::X509_NAME_digest($name, $sha1_digest)), "044d7ea7fddced7b9b63799600b9989a63b36819", "X509_NAME_digest");
ok(my $ext_idx = Net::SSLeay::X509_get_ext_by_NID($x509, &Net::SSLeay::NID_ext_key_usage), "X509_get_ext_by_NID");
ok(my $ext = Net::SSLeay::X509_get_ext($x509, $ext_idx), "X509_get_ext");

View File

@ -1,11 +1,12 @@
Name: perl-Net-SSLeay
Version: 1.63
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Perl extension for using OpenSSL
Group: Development/Libraries
License: OpenSSL
URL: http://search.cpan.org/dist/Net-SSLeay/
Source0: http://search.cpan.org/CPAN/authors/id/M/MI/MIKEM/Net-SSLeay-%{version}.tar.gz
Patch2: Net-SSLeay-1.43-svn414.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
BuildRequires: openssl, openssl-devel
# =========== Module Build ===========================
@ -48,6 +49,9 @@ so you can write servers or clients for more complicated applications.
%prep
%setup -q -n Net-SSLeay-%{version}
# Fix failing test with openssl-1.0.1h (upstream commit 414, CPAN RT#96256)
%patch2
# Fix permissions in examples to avoid bogus doc-file dependencies
chmod -c 644 examples/*
@ -88,10 +92,13 @@ rm -rf %{buildroot}
%{_mandir}/man3/Net::SSLeay::Handle.3pm*
%changelog
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.63-2
* Sun Jun 8 2014 Paul Howarth <paul@city-fan.org> - 1.63-3
- Fix failing test with openssl-1.0.1h (upstream commit 414, CPAN RT#96256)
* Sat Jun 7 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.63-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Mon May 19 2014 Paul Howarth <paul@city-fan.org> - 1.63-1.0.cf
* Mon May 19 2014 Paul Howarth <paul@city-fan.org> - 1.63-1
- Update to 1.63
- Improvements to OCSP support: it turns out that some CAs (like Verisign)
sign the OCSP response with the CA we have in the trust store and don't