From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Mon, 20 Oct 2025 12:45:57 +0000 (-0400)
Subject: Fix thinko in commit 7d129ba54.
X-Git-Tag: REL_16_11~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1e1db780e50f9723edf67c52a7920e09c4dab40;p=thirdparty%2Fpostgresql.git

Fix thinko in commit 7d129ba54.

The revised logic in 001_ssltests.pl would fail if openssl
doesn't work or if Perl is a 32-bit build, because it had
already overwritten $serialno with something inappropriate
to use in the eventual match.  We could go back to the
previous code layout, but it seems best to introduce a
separate variable for the output of openssl.

Per failure on buildfarm member mamba, which has a 32-bit Perl.
---

diff --git a/src/test/ssl/t/001_ssltests.pl b/src/test/ssl/t/001_ssltests.pl
index 7e2c596bb32..7f90c4efdd6 100644
--- a/src/test/ssl/t/001_ssltests.pl
+++ b/src/test/ssl/t/001_ssltests.pl
@@ -708,7 +708,7 @@ my $serialno = '\d+';
 
 if ($ENV{OPENSSL} ne '')
 {
-	$serialno = `$ENV{OPENSSL} x509 -serial -noout -in ssl/client.crt`;
+	my $serialstr = `$ENV{OPENSSL} x509 -serial -noout -in ssl/client.crt`;
 	if ($? == 0)
 	{
 		# OpenSSL prints serial numbers in hexadecimal and converting the serial
@@ -719,9 +719,9 @@ if ($ENV{OPENSSL} ne '')
 		{
 			no warnings qw(portable);
 
-			$serialno =~ s/^serial=//;
-			$serialno =~ s/\s+//g;
-			$serialno = hex($serialno);
+			$serialstr =~ s/^serial=//;
+			$serialstr =~ s/\s+//g;
+			$serialno = hex($serialstr);
 		}
 	}
 }