rpms/perl-Net-SSLeay
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix of callback count after openssl 3.0.0-alpha16

Browse Source 
Related: rhbz#1985255

In OpenSSL between alpha16 and alpha17 was change
(7bc027d73bc51cfa0ae23fbfd91134be9464d694)
which add one callback call in case of failing
pem_read_bio_key_decoder()
This commit is contained in:
Michal Josef Špaček 2021-07-23 12:39:55 +02:00
parent bf25e57213
commit f327b2de67
2 changed files with 85 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
Net-SSLeay-1.90-openssl3.0.0-05_passwd_cb.patch Normal file
View File

@ -0,0 +1,80 @@
From e5a24498cb5294985b526ae1697fb3c10022573e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Josef=20=C5=A0pa=C4=8Dek?= <mspacek@redhat.com>
Date: Fri, 23 Jul 2021 12:21:10 +0200
Subject: [PATCH] Fix of callback count after openssl 3.0.0-alpha16
In OpenSSL between alpha16 and alpha17 was change
(7bc027d73bc51cfa0ae23fbfd91134be9464d694)
which add one callback call in case of failing
pem_read_bio_key_decoder()
---
t/local/05_passwd_cb.t | 41 ++++++++++++++++++++++++++++++++++++++---
1 file changed, 38 insertions(+), 3 deletions(-)
diff --git a/t/local/05_passwd_cb.t b/t/local/05_passwd_cb.t
index 878e2aa..7c45fad 100644
--- a/t/local/05_passwd_cb.t
+++ b/t/local/05_passwd_cb.t
@@ -5,7 +5,12 @@ use lib 'inc';
use Net::SSLeay;
use Test::Net::SSLeay qw( data_file_path initialise_libssl );
-plan tests => 36;
+my $callback_double_use_in_pem_read_bio_key = check_callback_double_use_in_pem_read_bio_key();
+if (! $callback_double_use_in_pem_read_bio_key) {
+ plan tests => 36;
+} else {
+ plan tests => 40;
+}
initialise_libssl();
@@ -99,7 +104,13 @@ $key_password = 'incorrect';
ok( !Net::SSLeay::CTX_use_PrivateKey_file($ctx_1, $key_pem, &Net::SSLeay::FILETYPE_PEM),
'CTX_use_PrivateKey_file doesn\'t work with wrong passphrase' );
-is($cb_1_calls, 2, 'callback1 called 2 times');
+my $right_cb_1_calls;
+if (! $callback_double_use_in_pem_read_bio_key) {
+ $right_cb_1_calls = 2;
+} else {
+ $right_cb_1_calls = 3;
+}
+is($cb_1_calls, $right_cb_1_calls, 'callback1 called '.$right_cb_1_calls.' times');
# OpenSSL 1.1.0 has SSL_set_default_passwd_cb, but the callback is not
@@ -177,5 +188,29 @@ sub test_ssl_funcs
ok( !Net::SSLeay::use_PrivateKey_file($ssl_1, $key_pem, &Net::SSLeay::FILETYPE_PEM),
'use_PrivateKey_file doesn\'t work with wrong passphrase' );
- is($cb_1_calls, 2, 'callback1 called 2 times');
+ my $right_cb_1_calls;
+ if (! $callback_double_use_in_pem_read_bio_key) {
+ $right_cb_1_calls = 2;
+ } else {
+ $right_cb_1_calls = 3;
+ }
+
+ is($cb_1_calls, $right_cb_1_calls, 'callback1 called '.$right_cb_1_calls.' times');
+}
+
+# In OpenSSL between alpha16 and alpha17 was change (7bc027d73bc51cfa0ae23fbfd91134be9464d694)
+# which add one callback call in case of failing pem_read_bio_key_decoder()
+sub check_callback_double_use_in_pem_read_bio_key {
+ my $ssleay_version = Net::SSLeay::SSLeay_version( Net::SSLeay::SSLEAY_VERSION() );
+ my $openssl_alpha_version;
+ if (Net::SSLeay::SSLeay == 0x30000000 && $ssleay_version =~ /-alpha(\d+)\ /) {
+ $openssl_alpha_version = $1;
+ }
+ if ((Net::SSLeay::SSLeay == 0x30000000 && defined $openssl_alpha_version && $openssl_alpha_version < 17)
+ || Net::SSLeay::SSLeay < 0x30000000) {
+
+ return 0;
+ } else {
+ return 1;
+ }
}
--
2.31.1

5
perl-Net-SSLeay.spec
View File

@ -17,6 +17,7 @@ Patch12: Net-SSLeay-1.90-openssl3.0.0-33_x509_create_cert.patch
Patch13: Net-SSLeay-1.90-openssl3.0.0-39_pkcs12.patch
Patch14: Net-SSLeay-1.90-openssl3.0.0-43_misc_functions.patch
Patch15: Net-SSLeay-1.90-openssl3.0.0-tests-disable_TLS1_and_TLS1_1.patch
Patch16: Net-SSLeay-1.90-openssl3.0.0-05_passwd_cb.patch
# =========== Module Build ===========================
BuildRequires: coreutils
BuildRequires: findutils
@ -101,6 +102,9 @@ so you can write servers or clients for more complicated applications.
# XXX Disable TLS1 and TLS1_1 from tests
%patch15 -p1
# https://github.com/radiator-software/p5-net-ssleay/pull/282
%patch16 -p1
# Fix permissions in examples to avoid bogus doc-file dependencies
chmod -c 644 examples/*
@ -139,6 +143,7 @@ make test
%changelog
* Fri Jul 23 2021 Michal Josef Špaček <mspacek@redhat.com> - 1.90-6
- Fix tests for openssl 3.0.0-beta1. rhbz#1964854
- Add fix for t/05_passwd_cb.t
- Update Net-SSLeay-1.90-openssl3.0.0-43_misc_functions.patch to accept beta version
- Fix tab vs space in spec file
- Update Net-SSLeay-1.90-openssl3.0.0-39_pkcs12.patch patch to upstream version