Update to 1.94

- New upstream release 1.94
  - Net::SSLeay now officially supports all stable releases of OpenSSL 3.1 and
    3.2, and LibreSSL 3.5-3.8
  - Many noisy compiler warnings have been silenced - if SSLeay.xs fails to
    compile, it should now be much easier to identify the cause
  - libcrypto's OPENSSL_init_crypto() function and libssl's OPENSSL_init_ssl()
    function are now exposed, enabling fine-grained control over the
    initialisation and configuration of both libraries
  - libssl functions implementing TLS 1.3 PSK authentication are now exposed,
    in particular SSL_CTX_set_psk_find_session_callback() (on the server side)
    and SSL_CTX_set_psk_use_session_callback() (on the client side)
  - libssl functions implementing server-side TLS 1.2 PSK authentication are
    now exposed, in particular SSL_CTX_set_psk_server_callback()
  - libssl's SSL_CTX_set_client_hello_cb() function is now exposed, allowing a
    TLS server to set a callback function that is executed when the server
    processes a ClientHello message
  - Many more libcrypto/libssl constants and functions are now exposed; see the
    release notes for the 1.93 developer releases for a full list
This commit is contained in:
Paul Howarth 2024-01-08 09:13:43 +00:00
parent b01f20ee96
commit 12381401f6
4 changed files with 26 additions and 217 deletions

View File

@ -1,204 +0,0 @@
--- t/local/33_x509_create_cert.t
+++ t/local/33_x509_create_cert.t
@@ -93,8 +93,8 @@ is(Net::SSLeay::X509_NAME_cmp($ca_issuer
&Net::SSLeay::NID_crl_distribution_points => 'URI:http://pki.dom.com/crl1.pem,URI:http://pki.dom.com/crl2.pem',
), "P_X509_add_extensions");
- ok(my $sha1_digest = Net::SSLeay::EVP_get_digestbyname("sha1"), "EVP_get_digestbyname");
- ok(Net::SSLeay::X509_sign($x509, $ca_pk, $sha1_digest), "X509_sign");
+ ok(my $sha256_digest = Net::SSLeay::EVP_get_digestbyname("sha256"), "EVP_get_digestbyname");
+ ok(Net::SSLeay::X509_sign($x509, $ca_pk, $sha256_digest), "X509_sign");
is(Net::SSLeay::X509_get_version($x509), 3, "X509_get_version");
is(Net::SSLeay::X509_verify($x509, Net::SSLeay::X509_get_pubkey($ca_cert)), 1, "X509_verify");
@@ -186,8 +186,8 @@ is(Net::SSLeay::X509_NAME_cmp($ca_issuer
ok(Net::SSLeay::X509_REQ_set_version($req, 2), "X509_REQ_set_version");
- ok(my $sha1_digest = Net::SSLeay::EVP_get_digestbyname("sha1"), "EVP_get_digestbyname");
- ok(Net::SSLeay::X509_REQ_sign($req, $pk, $sha1_digest), "X509_REQ_sign");
+ ok(my $sha256_digest = Net::SSLeay::EVP_get_digestbyname("sha256"), "EVP_get_digestbyname");
+ ok(Net::SSLeay::X509_REQ_sign($req, $pk, $sha256_digest), "X509_REQ_sign");
ok(my $req_pubkey = Net::SSLeay::X509_REQ_get_pubkey($req), "X509_REQ_get_pubkey");
is(Net::SSLeay::X509_REQ_verify($req, $req_pubkey), 1, "X509_REQ_verify");
@@ -228,7 +228,7 @@ is(Net::SSLeay::X509_NAME_cmp($ca_issuer
ok(Net::SSLeay::X509_set_pubkey($x509ss,$tmppkey), "X509_set_pubkey");
Net::SSLeay::EVP_PKEY_free($tmppkey);
- ok(Net::SSLeay::X509_sign($x509ss, $ca_pk, $sha1_digest), "X509_sign");
+ ok(Net::SSLeay::X509_sign($x509ss, $ca_pk, $sha256_digest), "X509_sign");
like(my $crt_pem = Net::SSLeay::PEM_get_string_X509($x509ss), qr/-----BEGIN CERTIFICATE-----/, "PEM_get_string_X509");
#write_file("tmp_cert2.crt.pem", $crt_pem);
@@ -296,8 +296,8 @@ is(Net::SSLeay::X509_NAME_cmp($ca_issuer
ok(Net::SSLeay::P_ASN1_TIME_set_isotime(Net::SSLeay::X509_get_notAfter($x509), "2038-01-01T00:00:00Z"), "P_ASN1_TIME_set_isotime+X509_get_notAfter");
}
- ok(my $sha1_digest = Net::SSLeay::EVP_get_digestbyname("sha1"), "EVP_get_digestbyname");
- ok(Net::SSLeay::X509_sign($x509, $ca_pk, $sha1_digest), "X509_sign");
+ ok(my $sha256_digest = Net::SSLeay::EVP_get_digestbyname("sha256"), "EVP_get_digestbyname");
+ ok(Net::SSLeay::X509_sign($x509, $ca_pk, $sha256_digest), "X509_sign");
like(my $crt_pem = Net::SSLeay::PEM_get_string_X509($x509), qr/-----BEGIN CERTIFICATE-----/, "PEM_get_string_X509");
like(my $key_pem = Net::SSLeay::PEM_get_string_PrivateKey($pk), qr/-----BEGIN (RSA )?PRIVATE KEY-----/, "PEM_get_string_PrivateKey");
@@ -311,8 +311,8 @@ is(Net::SSLeay::X509_NAME_cmp($ca_issuer
ok(my $bio = Net::SSLeay::BIO_new_file($req_pem, 'r'), "BIO_new_file");
ok(my $req = Net::SSLeay::PEM_read_bio_X509_REQ($bio), "PEM_read_bio_X509");
- ok(my $sha1_digest = Net::SSLeay::EVP_get_digestbyname("sha1"), "EVP_get_digestbyname");
- is(unpack("H*", Net::SSLeay::X509_REQ_digest($req, $sha1_digest)), "372c21a20a6d4e15bf8ecefb487cc604d9a10960", "X509_REQ_digest");
+ ok(my $sha256_digest = Net::SSLeay::EVP_get_digestbyname("sha256"), "EVP_get_digestbyname");
+ is(unpack("H*", Net::SSLeay::X509_REQ_digest($req, $sha256_digest)), "420e99da1e23e192409ab2a5f1a9b09ac03c52fa4b8bd0d19e561358f9880e88", "X509_REQ_digest");
ok(my $req2 = Net::SSLeay::X509_REQ_new(), "X509_REQ_new");
ok(my $name = Net::SSLeay::X509_REQ_get_subject_name($req), "X509_REQ_get_subject_name");
--- t/local/34_x509_crl.t
+++ t/local/34_x509_crl.t
@@ -39,8 +39,8 @@ ok(my $ca_pk = Net::SSLeay::PEM_read_bio
}
is(Net::SSLeay::X509_CRL_get_version($crl1), 1, "X509_CRL_get_version");
- ok(my $sha1_digest = Net::SSLeay::EVP_get_digestbyname("sha1"), "EVP_get_digestbyname");
- is(unpack("H*",Net::SSLeay::X509_CRL_digest($crl1, $sha1_digest)), 'f0e5c853477a206c03f7347aee09a01d91df0ac5', "X509_CRL_digest");
+ ok(my $sha256_digest = Net::SSLeay::EVP_get_digestbyname("sha256"), "EVP_get_digestbyname");
+ is(unpack("H*",Net::SSLeay::X509_CRL_digest($crl1, $sha256_digest)), '4edc18ec956e722cbcf96589a43535c2d1d557e3cec55b1e421897827c3bb8be', "X509_CRL_digest");
}
{ ### X509_CRL create
@@ -100,12 +100,12 @@ ok(my $ca_pk = Net::SSLeay::PEM_read_bio
&Net::SSLeay::NID_authority_key_identifier => 'keyid:always,issuer:always',
), "P_X509_CRL_add_extensions");
- ok(my $sha1_digest = Net::SSLeay::EVP_get_digestbyname("sha1"), "EVP_get_digestbyname");
+ ok(my $sha256_digest = Net::SSLeay::EVP_get_digestbyname("sha256"), "EVP_get_digestbyname");
SKIP: {
skip('requires openssl-0.9.7', 1) unless Net::SSLeay::SSLeay >= 0x0090700f;
ok(Net::SSLeay::X509_CRL_sort($crl), "X509_CRL_sort");
}
- ok(Net::SSLeay::X509_CRL_sign($crl, $ca_pk, $sha1_digest), "X509_CRL_sign");
+ ok(Net::SSLeay::X509_CRL_sign($crl, $ca_pk, $sha256_digest), "X509_CRL_sign");
like(my $crl_pem = Net::SSLeay::PEM_get_string_X509_CRL($crl), qr/-----BEGIN X509 CRL-----/, "PEM_get_string_X509_CRL");
--- t/local/44_sess.t
+++ t/local/44_sess.t
@@ -2,7 +2,7 @@
use lib 'inc';
-use Net::SSLeay;
+use Net::SSLeay qw( ERROR_SSL );
use Test::Net::SSLeay qw(
can_fork data_file_path initialise_libssl is_protocol_usable new_ctx
tcp_socket
@@ -13,7 +13,7 @@ use Storable;
if (not can_fork()) {
plan skip_all => "fork() not supported on this system";
} else {
- plan tests => 58;
+ plan tests => 59;
}
initialise_libssl();
@@ -142,6 +142,7 @@ sub server_remove_cb
my ($server_ctx, $client_ctx, $server_ssl, $client_ssl);
my $server = tcp_socket();
+my $proto_count = 0;
sub server
{
@@ -256,6 +257,14 @@ sub client {
Net::SSLeay::set_fd($ssl, $cl);
my $ret = Net::SSLeay::connect($ssl);
if ($ret <= 0) {
+ # Connection might fail due to attempted use of algorithm in key
+ # exchange that is forbidden by security policy, resulting in ERROR_SSL
+ my $ssl_err = Net::SSLeay::get_error($ssl, $ret);
+ if ($ssl_err == ERROR_SSL) {
+ diag("Protocol $proto, connect() failed, maybe due to security policy");
+ $usable{$round} = 0;
+ next;
+ }
diag("Protocol $proto, connect() returns $ret, Error: ".Net::SSLeay::ERR_error_string(Net::SSLeay::ERR_get_error()));
}
my $msg = Net::SSLeay::read($ssl);
@@ -275,6 +284,7 @@ sub client {
Net::SSLeay::shutdown($ssl);
Net::SSLeay::free($ssl);
close($cl) || die("client close: $!");
+ $proto_count += 1;
}
$cl = $server->connect();
@@ -359,6 +369,8 @@ sub test_stats {
}
}
+ cmp_ok($proto_count, '>=', 1, "At least one protocol fully testable");
+
# use Data::Dumper; print "Server:\n" . Dumper(\%srv_stats);
# use Data::Dumper; print "Client:\n" . Dumper(\%clt_stats);
}
--- t/local/45_exporter.t
+++ t/local/45_exporter.t
@@ -2,7 +2,7 @@
use lib 'inc';
-use Net::SSLeay;
+use Net::SSLeay qw( ERROR_SSL );
use Test::Net::SSLeay qw(
can_fork data_file_path initialise_libssl is_protocol_usable new_ctx
tcp_socket
@@ -15,7 +15,7 @@ if (not can_fork()) {
} elsif (!defined &Net::SSLeay::export_keying_material) {
plan skip_all => "No export_keying_material()";
} else {
- plan tests => 36;
+ plan tests => 37;
}
initialise_libssl();
@@ -37,6 +37,7 @@ my (%server_stats, %client_stats);
my ($server_ctx, $client_ctx, $server_ssl, $client_ssl);
my $server = tcp_socket();
+my $proto_count = 0;
sub server
{
@@ -88,6 +89,16 @@ sub client {
Net::SSLeay::set_fd( $ssl, $cl );
my $ret = Net::SSLeay::connect($ssl);
if ($ret <= 0) {
+ # Connection might fail due to attempted use of algorithm in key
+ # exchange that is forbidden by security policy, resulting in ERROR_SSL
+ my $ssl_err = Net::SSLeay::get_error($ssl, $ret);
+ if ($ssl_err == ERROR_SSL) {
+ diag("Protocol $round, connect() failed, maybe due to security policy");
+ SKIP: {
+ skip( "$round not available in this enviornment", 9 );
+ }
+ next;
+ }
diag("Protocol $round, connect() returns $ret, Error: ".Net::SSLeay::ERR_error_string(Net::SSLeay::ERR_get_error()));
}
@@ -100,6 +111,7 @@ sub client {
Net::SSLeay::shutdown($ssl);
Net::SSLeay::free($ssl);
close($cl) || die("client close: $!");
+ $proto_count += 1;
}
else {
SKIP: {
@@ -168,4 +180,7 @@ sub test_export_early
server();
client();
waitpid $pid, 0;
+
+cmp_ok($proto_count, '>=', 1, "At least one protocol fully testable");
+
exit(0);

View File

@ -1,4 +1,2 @@
from Config import *
# SSL library allows user to set Crypto Policy
addFilter("crypto-policy-non-compliance-openssl /usr/lib64/perl5/vendor_perl/auto/Net/SSLeay/SSLeay.so SSL_CTX_set_cipher_list");
addFilter("crypto-policy-non-compliance-openssl /usr/lib64/perl5/vendor_perl/auto/Net/SSLeay/SSLeay.so SSL_CTX_set_cipher_list")

View File

@ -5,14 +5,13 @@
%endif
Name: perl-Net-SSLeay
Version: 1.92
Release: 10%{?dist}
Version: 1.94
Release: 1%{?dist}
Summary: Perl extension for using OpenSSL
License: Artistic-2.0
URL: https://metacpan.org/release/Net-SSLeay
Source0: https://cpan.metacpan.org/modules/by-module/Net/Net-SSLeay-%{version}.tar.gz
Patch10: Net-SSLeay-1.90-pkgconfig.patch
Patch12: Net-SSLeay-1.92-no-sha1.patch
# =========== Module Build ===========================
BuildRequires: coreutils
BuildRequires: findutils
@ -60,9 +59,9 @@ BuildRequires: perl(Test::Builder)
BuildRequires: perl(Test::More) >= 0.61
BuildRequires: perl(threads)
BuildRequires: perl(warnings)
# =========== Optional Test Suite ====================
# =========== Optional Tests =========================
%if %{with perl_Net_SSLeay_enables_optional_test}
BuildRequires: perl(Test::Exception)
BuildRequires: perl(Crypt::OpenSSL::Bignum)
# Test::Kwalitee 1.00 not used
BuildRequires: perl(Test::Pod) >= 1.41
# Test::Pod::Coverage 1.00 not used
@ -88,10 +87,6 @@ so you can write servers or clients for more complicated applications.
# https://github.com/radiator-software/p5-net-ssleay/pull/127
%patch -P 10
# Work around EL-9, ELN issues with SHA-1 usage
# https://github.com/radiator-software/p5-net-ssleay/pull/433
%patch -P 12
# Fix permissions in examples to avoid bogus doc-file dependencies
chmod -c 644 examples/*
@ -128,6 +123,26 @@ make test
%{_mandir}/man3/Net::SSLeay::Handle.3*
%changelog
* Mon Jan 8 2024 Paul Howarth <paul@city-fan.org> - 1.94-1
- Update to 1.94
- Net::SSLeay now officially supports all stable releases of OpenSSL 3.1 and
3.2, and LibreSSL 3.5-3.8
- Many noisy compiler warnings have been silenced - if SSLeay.xs fails to
compile, it should now be much easier to identify the cause
- libcrypto's OPENSSL_init_crypto() function and libssl's OPENSSL_init_ssl()
function are now exposed, enabling fine-grained control over the
initialisation and configuration of both libraries
- libssl functions implementing TLS 1.3 PSK authentication are now exposed,
in particular SSL_CTX_set_psk_find_session_callback() (on the server side)
and SSL_CTX_set_psk_use_session_callback() (on the client side)
- libssl functions implementing server-side TLS 1.2 PSK authentication are
now exposed, in particular SSL_CTX_set_psk_server_callback()
- libssl's SSL_CTX_set_client_hello_cb() function is now exposed, allowing a
TLS server to set a callback function that is executed when the server
processes a ClientHello message
- Many more libcrypto/libssl constants and functions are now exposed; see the
release notes for the 1.93 developer releases for a full list
* Thu Aug 3 2023 Paul Howarth <paul@city-fan.org> - 1.92-10
- Rebuild for OpenSSL 3.1.1 in Rawhide

View File

@ -1 +1 @@
SHA512 (Net-SSLeay-1.92.tar.gz) = e9d9161ebeb7be90f4c7a0ea98f1034892ce6d33aa72872683177b19daa1f4c5819f85ea9a052a076ec8d7c21705f6c344aef64680bc881bf3218d38e8b7b173
SHA512 (Net-SSLeay-1.94.tar.gz) = f1461667269f3da56ff7e1724b5511b95c34582250f8336e9f93d30f3b30d4a5360eb27622b9730bba11df75e00d717c7f0cea2120d20206723db136a8509375