Fix thinko in commit 7d129ba.

tglsfdc · tglsfdc · commit d74cfe3263fa · 2025-10-20T08:45:57.000-04:00
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
@@ -754,7 +754,7 @@ sub switch_server_cert
 
 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
@@ -765,9 +765,9 @@ sub switch_server_cert
 		{
 			no warnings qw(portable);
 
-			$serialno =~ s/^serial=//;
-			$serialno =~ s/\s+//g;
-			$serialno = hex($serialno);
+			$serialstr =~ s/^serial=//;
+			$serialstr =~ s/\s+//g;
+			$serialno = hex($serialstr);
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -754,7 +754,7 @@ sub switch_server_cert`
`754`	`754`
`755`	`755`	`if ($ENV{OPENSSL} ne '')`
`756`	`756`	`{`
`757`		- $serialno = `$ENV{OPENSSL} x509 -serial -noout -in ssl/client.crt`;
	`757`	+ my $serialstr = `$ENV{OPENSSL} x509 -serial -noout -in ssl/client.crt`;
`758`	`758`	`if ($? == 0)`
`759`	`759`	`{`
`760`	`760`	`# OpenSSL prints serial numbers in hexadecimal and converting the serial`
`@@ -765,9 +765,9 @@ sub switch_server_cert`
`765`	`765`	`{`
`766`	`766`	`no warnings qw(portable);`
`767`	`767`
`768`		`- $serialno =~ s/^serial=//;`
`769`		`- $serialno =~ s/\s+//g;`
`770`		`- $serialno = hex($serialno);`
	`768`	`+ $serialstr =~ s/^serial=//;`
	`769`	`+ $serialstr =~ s/\s+//g;`
	`770`	`+ $serialno = hex($serialstr);`
`771`	`771`	`}`
`772`	`772`	`}`
`773`	`773`	`}`